From 7057adc05537dc47c43125784a93171657eacedf Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 23:37:47 +0800
Subject: [PATCH] Merge branch 'master' of git://github.com/andrey-nakin/scpi-parser into andrey-nakin-master

---
 libscpi/inc/scpi/units.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libscpi/inc/scpi/units.h b/libscpi/inc/scpi/units.h
index 8a06301..e66e521 100644
--- a/libscpi/inc/scpi/units.h
+++ b/libscpi/inc/scpi/units.h
@@ -46,7 +46,7 @@
     extern const scpi_unit_def_t scpi_units_def[];
     extern const scpi_special_number_def_t scpi_special_numbers_def[];
     
-    bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, bool_t mandatory);
+    scpi_bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, scpi_bool_t mandatory);
     size_t SCPI_NumberToStr(scpi_t * context, scpi_number_t * value, char * str, size_t len);
 
 #ifdef	__cplusplus

--
Gitblit v1.9.1