7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' of https://github.com/geode-sdk/sdk into main

Browse source
This commit is contained in:
camila314 2022-02-16 23:07:21 -06:00
commit 089d138e74
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin

@ -1 +1 @@
Subproject commit 07b6a2a43489a22d3ccb30df4a1ceebd3986455d
Subproject commit c5f78a0c50ddea91abcc07eadd01244cb3f541ed

4
include/cocos/cocos2dx/platform/third_party/win32/pthread/pthread.h vendored
View file

@ -285,7 +285,7 @@ enum {
# endif
#endif
#include <sched.h>
#include <../pthread/sched.h>
/*
* To avoid including windows.h we define only those things that we
@ -302,6 +302,7 @@ enum {
#endif
#endif
#ifndef _INC_TIME
#ifndef HAVE_STRUCT_TIMESPEC
#define HAVE_STRUCT_TIMESPEC 1
struct timespec {
@ -309,6 +310,7 @@ struct timespec {
long tv_nsec;
};
#endif /* HAVE_STRUCT_TIMESPEC */
#endif /* _INC_TIME */
#ifndef SIG_BLOCK
#define SIG_BLOCK 0