From bc9b3a265af0a9ee6b356472800f4940f5c2847c Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 31 5月 2016 18:16:22 +0800
Subject: [PATCH] Fix compilation under c++ compiler
---
libscpi/inc/scpi/utils.h | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/libscpi/inc/scpi/utils.h b/libscpi/inc/scpi/utils.h
index ba80b8e..be538e1 100644
--- a/libscpi/inc/scpi/utils.h
+++ b/libscpi/inc/scpi/utils.h
@@ -43,13 +43,16 @@
extern "C" {
#endif
- size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len, int8_t base);
-#define SCPI_LongToStr(val, str, len, base) SCPI_Int32ToStr((val), (str), (len), (base))
- size_t SCPI_UInt32ToStr(uint32_t val, char * str, size_t len, int8_t base);
- size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len, int8_t base);
- size_t SCPI_UInt64ToStr(uint64_t val, char * str, size_t len, int8_t base);
+ size_t SCPI_UInt32ToStrBase(uint32_t val, char * str, size_t len, int8_t base);
+ size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len);
+ size_t SCPI_UInt64ToStrBase(uint64_t val, char * str, size_t len, int8_t base);
+ size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len);
+ size_t SCPI_FloatToStr(float val, char * str, size_t len);
size_t SCPI_DoubleToStr(double val, char * str, size_t len);
+ // deprecated finction, should be removed later
+#define SCPI_LongToStr(val, str, len, base) SCPI_Int32ToStr((val), (str), (len), (base), TRUE)
+
#ifdef __cplusplus
}
#endif
--
Gitblit v1.9.1