From cbdf27b81c8e0fc46dc2c7b5596cc1616a575d34 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 13 2月 2014 03:29:02 +0800
Subject: [PATCH] Rename src/utils.h -> inc/scpi/utils_private.h

---
 libscpi/inc/scpi/types.h |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index dff7991..3597275 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -47,12 +47,16 @@
 extern "C" {
 #endif
 
-#define FALSE false
-#define TRUE true
+#ifndef FALSE
+    #define FALSE 0
+#endif
+#ifndef TRUE
+    #define TRUE (!FALSE)
+#endif
 
     /* basic data types */
-    typedef bool bool_t;
-    /* typedef enum { FALSE = 0, TRUE } bool_t; */
+    typedef bool scpi_bool_t;
+    /* typedef enum { FALSE = 0, TRUE } scpi_bool_t; */
 
     /* IEEE 488.2 registers */
     enum _scpi_reg_name_t {
@@ -198,12 +202,13 @@
         scpi_interface_t * interface;
         int_fast16_t output_count;
         int_fast16_t input_count;
-        bool_t cmd_error;
+        scpi_bool_t cmd_error;
         scpi_error_queue_t error_queue;
         scpi_reg_val_t * registers;
         const scpi_unit_def_t * units;
         const scpi_special_number_def_t * special_numbers;
         void * user_context;
+        const char * idn[4];
     };
 
 #ifdef  __cplusplus

--
Gitblit v1.9.1