diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2020-09-29 22:55:53 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2020-09-29 22:55:53 -0400 |
| commit | 7c4be3103501672f96191329ae15d899eb1aae4a (patch) | |
| tree | a80854618b148babb330a61ad280bfe8c0470745 /include | |
| parent | 327f50ac00dd60c264dae63e96ced917d593c651 (diff) | |
| parent | 89d7e06a792a5859b3d284257612820feb2980a2 (diff) | |
Merge branch 'master' of https://github.com/doldecomp/pokerevo into label_ctors
Diffstat (limited to 'include')
| -rw-r--r-- | include/GameSpy/darray.h (renamed from include/darray.h) | 0 | ||||
| -rw-r--r-- | include/GameSpy/hashtable.h (renamed from include/hashtable.h) | 2 | ||||
| -rw-r--r-- | include/GameSpy/nonport.h (renamed from include/nonport.h) | 0 | ||||
| -rw-r--r-- | include/libstdc++/qsort.h (renamed from include/qsort.h) | 0 |
4 files changed, 1 insertions, 1 deletions
diff --git a/include/darray.h b/include/GameSpy/darray.h index 5c7c170..5c7c170 100644 --- a/include/darray.h +++ b/include/GameSpy/darray.h diff --git a/include/hashtable.h b/include/GameSpy/hashtable.h index 784ab35..26e0b6d 100644 --- a/include/hashtable.h +++ b/include/GameSpy/hashtable.h @@ -5,7 +5,7 @@ extern "C" {
#endif
-#include "darray.h"
+#include "GameSpy/darray.h"
typedef s32 (*HashFunction)(void *, s32);
diff --git a/include/nonport.h b/include/GameSpy/nonport.h index c1ed0e7..c1ed0e7 100644 --- a/include/nonport.h +++ b/include/GameSpy/nonport.h diff --git a/include/qsort.h b/include/libstdc++/qsort.h index c13ae0e..c13ae0e 100644 --- a/include/qsort.h +++ b/include/libstdc++/qsort.h |