Prevent symbol clash in case boost/cstdint.h is already included

Author: tstenner

include/lsl_c.h

@@ -4,12 +4,15 @@
 #if defined(LIBLSL_FFI)
 // Skip any typedefs that might confuse a FFI header parser, e.g. cffi
 #elif defined(_MSC_VER) && _MSC_VER < 1600
+#if !defined(__STDC_CONSTANT_MACROS) && !defined(BOOST_CSTDINT_HPP)
 typedef signed char int8_t;
 typedef signed short int16_t;
 typedef unsigned short uint16_t;
 typedef signed int int32_t;
 typedef signed long long int64_t;
 typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+#endif
 #else
 #include <stdint.h>
 #endif

src/lsl_continuous_resolver_c.cpp

@@ -1,9 +1,9 @@
-#include "../include/lsl_c.h"
 #include "resolver_impl.h"
 #include "api_config.h"
 #include <iostream>
 
 extern "C" {
+#include "../include/lsl_c.h"
 // === implementation of the continuous_resolver class ===
 
 using namespace lsl;

src/lsl_freefuncs_c.cpp

@@ -1,4 +1,3 @@
-#include "../include/lsl_c.h"
 #include "common.h"
 #include "resolver_impl.h"
 #include "api_config.h"
@@ -13,6 +12,7 @@ using std::string;
 using std::vector;
 
 extern "C" {
+#include "../include/lsl_c.h"
 /**
 * Get the protocol version.
 */

src/lsl_inlet_c.cpp

@@ -1,7 +1,7 @@
-#include "../include/lsl_c.h"
 #include "stream_inlet_impl.h"
 
 extern "C" {
+#include "../include/lsl_c.h"
 // === implementation of the stream_inlet class ===
 
 using namespace lsl;

src/lsl_outlet_c.cpp

@@ -1,8 +1,8 @@
-#include "../include/lsl_c.h"
 #include "stream_outlet_impl.h"
 
 
 extern "C" {
+#include "../include/lsl_c.h"
 // === implementation of the lsl_outlet functions of the C API ===
 
 using namespace lsl;