mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-20 23:21:20 +02:00
Code Issues Projects Releases Wiki Activity

Fix pthread deprecation warning, fixes #502

Browse Source
This commit is contained in:
wolfy1339
2017-10-12 23:33:05 -04:00
committed by jacob1
parent 553b36b31c
commit 536b20b164
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConscript
View File

@@ -473,7 +473,7 @@ elif GetOption('release'):
if GetOption('static'): if GetOption('static'):
if platform == "Windows": if platform == "Windows":
env.Append(CPPDEFINES=['PTW32_STATIC_LIB']) env.Append(CPPDEFINES=['_PTW32_STATIC_LIB'])
if msvc: if msvc:
env.Append(CPPDEFINES=['ZLIB_WINAPI']) env.Append(CPPDEFINES=['ZLIB_WINAPI'])
else: else:

7
src/common/tpt-thread.h
View File

@@ -16,4 +16,11 @@
#include <pthread.h> #include <pthread.h>
#undef GetUserName #undef GetUserName
// Fix deprecation warnings with recent pthread versions on Windows
#ifdef _PTW32_STATIC_LIB
#if PTW32_VERSION =< 2, 8, 0, 0
#define PTW32_STATIC_LIB
#endif
#endif
#endif #endif