From a28ccd18f24b50dc62e37f1a5d8be641578343d9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 16 10月 2015 21:04:54 +0800
Subject: [PATCH] Resolve issue with strBaseToInt64 on 32bit platforms
---
libscpi/inc/scpi/types.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index bded006..38ee018 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -52,14 +52,14 @@
#endif
#if !HAVE_STDBOOL
- typedef unsigned char bool;
+ typedef unsigned char bool;
#endif
#ifndef FALSE
- #define FALSE 0
+#define FALSE 0
#endif
#ifndef TRUE
- #define TRUE (!FALSE)
+#define TRUE (!FALSE)
#endif
/* basic data types */
@@ -142,6 +142,7 @@
SCPI_TOKEN_COMMA,
SCPI_TOKEN_SEMICOLON,
SCPI_TOKEN_COLON,
+ SCPI_TOKEN_SPECIFIC_CHARACTER,
SCPI_TOKEN_QUESTION,
SCPI_TOKEN_NL,
SCPI_TOKEN_HEXNUM,
@@ -254,6 +255,7 @@
struct _scpi_number_parameter_t {
scpi_bool_t special;
+
union {
double value;
int32_t tag;
@@ -274,7 +276,9 @@
struct _scpi_command_t {
const char * pattern;
scpi_command_callback_t callback;
+#if USE_COMMAND_TAGS
int32_t tag;
+#endif /* USE_COMMAND_TAGS */
};
struct _scpi_interface_t {
--
Gitblit v1.9.1