Browse Source

Apply Windows CE patch by @frax2222 in #884

Julius Pfrommer 7 years ago
parent
commit
e567f3e0f6
2 changed files with 3 additions and 1 deletions
  1. 1 1
      CMakeLists.txt
  2. 2 0
      deps/ms_stdint.h

+ 1 - 1
CMakeLists.txt

@@ -23,7 +23,7 @@ if(GIT_FOUND)
         string(REPLACE "\n" "" OPEN62541_VER_COMMIT ${GIT_COM_ID} )
     endif()
 endif()
-if(NOT ${OPEN62541_VER_COMMIT})
+if("${OPEN62541_VER_COMMIT}" STREQUAL "")
     set(OPEN62541_VER_COMMIT "undefined")
 endif()
 

+ 2 - 0
deps/ms_stdint.h

@@ -47,6 +47,7 @@
 // compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
 // or compiler give many errors like this:
 //   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifndef UNDER_CE
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -54,6 +55,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+#endif
 
 // Define _W64 macros to mark types changing their size, like intptr_t.
 #ifndef _W64