undef SLIST_ENTRY defined in winnt.h and queue.h

.travis.yml

@@ -33,23 +33,21 @@ script:
 - mkdir -p build
 - cd build
 - echo "Cross compile release build for MinGW"
-- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake -DCMAKE_BUILD_TYPE=Release
-  -DEXAMPLESERVER=ON ..
+- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_AMALGAMATION=ON ..
 - make -j
-- zip open62541-win32.zip ../README.md exampleServer_datasource.exe libopen62541.dll libopen62541.a libopen62541.dll.a
+- zip open62541-win32.zip ../README.md exampleServer_datasource.exe libopen62541.dll open62541.h open62541.c
 - cp open62541-win32.zip ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Cross compile release build for 32-bit linux"
-- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-gcc-m32.cmake -DCMAKE_BUILD_TYPE=Release
-  -DEXAMPLESERVER=ON ..
+- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-gcc-m32.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_AMALGAMATION=ON ..
 - make -j
-- tar -pczf open62541-linux32.tar.gz ../README.md exampleServer_datasource libopen62541.so libopen62541.a
+- tar -pczf open62541-linux32.tar.gz ../README.md exampleServer_datasource libopen62541.so open62541.h open62541.c
 - cp open62541-linux32.tar.gz ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Compile release build for 64-bit linux"
-- cmake -DCMAKE_BUILD_TYPE=Release -DEXAMPLESERVER=ON ..
+- cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_AMALGAMATION=ON ..
 - make -j
-- tar -pczf open62541-linux64.tar.gz ../README.md exampleServer_datasource libopen62541.so libopen62541.a
+- tar -pczf open62541-linux64.tar.gz ../README.md exampleServer_datasource libopen62541.so open62541.h open62541.c
 - cp open62541-linux64.tar.gz ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Upgrade to gcc 4.8"
@@ -63,16 +61,15 @@ script:
 - make -j
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Documentation build"
-- cmake -DEXAMPLESERVER=ON -DEXTENSION_STATELESS=ON -DGENERATE_DOCUMENTATION=ON ..
+- cmake -DEXTENSION_STATELESS=ON -DGENERATE_DOCUMENTATION=ON ..
 - make -j
 - echo "Generate documentation"
 - make -j doc
 - echo "Debug build and unit tests (64 bit)"
 - make clean
-- cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNIT_TESTS=ON -DENABLE_COVERAGE=ON ..
+- cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_UNIT_TESTS=ON -DENABLE_COVERAGE=ON ..
 - make -j && make test
-- coveralls --gcov /usr/bin/gcov-4.8 -E '.*\.h' -E '.*CMakeCXXCompilerId\.cpp' -E
-  '.*CMakeCCompilerId\.c' -r ../
+- coveralls --gcov /usr/bin/gcov-4.8 -E '.*\.h' -E '.*CMakeCXXCompilerId\.cpp' -E '.*CMakeCCompilerId\.c' -r ../
 - cd ..
 after_success:
 - ./tools/.deployDoxygen.sh
@@ -84,9 +81,9 @@ before_deploy:
 - git clone https://github.com/raspberrypi/tools
 - cd -
 - export PATH=$PATH:~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/
-- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-rpi64.cmake -DCMAKE_BUILD_TYPE=Release -DEXAMPLESERVER=ON ..
+- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-rpi64.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_AMALGAMATION=ON..
 - make -j
-- tar -pczf open62541-raspberrypi.tar.gz ../README.md exampleServer_datasource libopen62541.so libopen62541.a
+- tar -pczf open62541-raspberrypi.tar.gz ../README.md exampleServer_datasource libopen62541.so open62541.h open62541.c
 - cp open62541-raspberrypi.tar.gz ..
 - cd ..
 deploy:

src/ua_util.h

@@ -62,6 +62,7 @@
 
 #ifdef _WIN32
 # include <windows.h>
+# undef SLIST_ENTRY
 # define RAND(SEED) (UA_UInt32)rand()
 #else
 # include <endian.h>