From 6054f2efebb898bbd32ab7388eae7b9ff4357b0a Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 21 10月 2013 03:50:04 +0800
Subject: [PATCH] Merge remote branch 'upstream/master'
---
examples/common/scpi-def.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/examples/common/scpi-def.h b/examples/common/scpi-def.h
index 905aaa4..7de40e8 100644
--- a/examples/common/scpi-def.h
+++ b/examples/common/scpi-def.h
@@ -3,6 +3,10 @@
#include "scpi/scpi.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern scpi_t scpi_context;
size_t SCPI_Write(scpi_t * context, const char * data, size_t len);
@@ -15,5 +19,9 @@
scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context);
+#ifdef __cplusplus
+}
+#endif
+
#endif // __SCPI_DEF_H_
--
Gitblit v1.9.1