From 1f3aae322221514a8df3e06c0adf6844a597b025 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 10 4月 2017 19:03:01 +0800
Subject: [PATCH] Merge pull request #85 from richardbarlow/master
---
libscpi/inc/scpi/types.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index de5e0d0..334843a 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -113,7 +113,12 @@
typedef struct _scpi_command_t scpi_command_t;
-#define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#if USE_COMMAND_TAGS
+ #define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#else
+ #define SCPI_CMD_LIST_END {NULL, NULL}
+#endif
+
/* scpi interface */
typedef struct _scpi_t scpi_t;
@@ -328,7 +333,7 @@
union {
double value;
int32_t tag;
- };
+ } content;
scpi_unit_t unit;
int8_t base;
};
--
Gitblit v1.9.1