From f4d3fcc03f61df6becf302f555b27da7e361eae5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 21 10月 2013 17:00:47 +0800
Subject: [PATCH] Merge branch 'master' of git://github.com/andrey-nakin/scpi-parser into andrey-nakin-master
---
libscpi/inc/scpi/types.h | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 295009c..4202751 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -1,5 +1,7 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * Copyright (c) 2013 Jan Breuer
+ * Richard.hmm
+ * Copyright (c) 2012 Jan Breuer
*
* All Rights Reserved
*
@@ -45,8 +47,12 @@
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;
@@ -135,7 +141,8 @@
SCPI_UNIT_OHM,
SCPI_UNIT_HERTZ,
SCPI_UNIT_CELSIUS,
- SCPI_UNIT_SECONDS
+ SCPI_UNIT_SECONDS,
+ SCPI_UNIT_DISTANCE
};
typedef enum _scpi_unit_t scpi_unit_t;
--
Gitblit v1.9.1