Merge pull request json-c#340 from commodo/fix-appveyor-build

strerror_override: add extern "C" and JSON_EXPORT specifiers for Visual C++ compilers
shinae-woo · Jul 28, 2017 · 8d8a785 · 8d8a785
2 parents fcad0ec + d8fbfc7
commit 8d8a785
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - sh autogen.sh
 
 before_script:
-  - ./configure --enable-strerror-override
+  - ./configure
 
 script:
   - make

diff --git a/strerror_override.h b/strerror_override.h
@@ -4,10 +4,20 @@
 #include "config.h"
 #include <errno.h>
 
-char *_json_c_strerror(int errno_in);
+#include "json_object.h" /* for JSON_EXPORT */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JSON_EXPORT char *_json_c_strerror(int errno_in);
 
 #ifndef STRERROR_OVERRIDE_IMPL
 #define strerror	_json_c_strerror
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _json_strerror_override_h_ */