From a10c464ba98e980b21185bf084789f6c8df22473 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@gmail.com>
Date: 周三, 19 7月 2017 21:03:37 +0800
Subject: [PATCH] moving bool choice definition (ON, OFF) to units.c, so it could be used by various applications

---
 libscpi/src/utils_private.h |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h
index b96d73d..f83c6d4 100644
--- a/libscpi/src/utils_private.h
+++ b/libscpi/src/utils_private.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2012-2013 Jan Breuer,
  *
  * All Rights Reserved
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -11,7 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
 /**
  * @file   scpi_utils.h
  * @date   Thu Nov 15 10:58:45 UTC 2012
- * 
+ *
  * @brief  Conversion routines and string manipulation routines
- * 
- * 
+ *
+ *
  */
 
 #ifndef SCPI_UTILS_PRIVATE_H
@@ -74,6 +74,11 @@
 #define SCPI_DTOSTRE_PLUS_SIGN   4
     char * SCPI_dtostre(double __val, char * __s, size_t __ssize, unsigned char __prec, unsigned char __flags);
 
+    scpi_array_format_t SCPI_GetNativeFormat(void);
+    uint16_t SCPI_Swap16(uint16_t val);
+    uint32_t SCPI_Swap32(uint32_t val);
+    uint64_t SCPI_Swap64(uint64_t val);
+
 #if !HAVE_STRNLEN
     size_t BSD_strnlen(const char *s, size_t maxlen) LOCAL;
 #endif
@@ -82,6 +87,17 @@
     int OUR_strncasecmp(const char *s1, const char *s2, size_t n) LOCAL;
 #endif
 
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+    void scpiheap_init(scpi_error_info_heap_t * heap, char * error_info_heap, size_t error_info_heap_length);
+    char * scpiheap_strndup(scpi_error_info_heap_t * heap, const char *s, size_t n) LOCAL;
+    void scpiheap_free(scpi_error_info_heap_t * heap, char *s, scpi_bool_t rollback) LOCAL;
+    scpi_bool_t scpiheap_get_parts(scpi_error_info_heap_t * heap, const char *s1, size_t * len1, const char ** s2, size_t * len2) LOCAL;
+#endif
+
+#if !HAVE_STRNDUP
+    char *OUR_strndup(const char *s, size_t n);
+#endif
+
 #ifndef min
 #define min(a, b)  (((a) < (b)) ? (a) : (b))
 #endif

--
Gitblit v1.9.1