From 9c2c61bde82bb4111355ade6d253621189e9595a Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 04 1月 2014 00:28:37 +0800
Subject: [PATCH] Merge pull request #11 from wolf99/master
---
libscpi/inc/scpi/types.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 4202751..3597275 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -55,8 +55,8 @@
#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 {
@@ -202,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