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 /src | |
| parent | 327f50ac00dd60c264dae63e96ced917d593c651 (diff) | |
| parent | 89d7e06a792a5859b3d284257612820feb2980a2 (diff) | |
Merge branch 'master' of https://github.com/doldecomp/pokerevo into label_ctors
Diffstat (limited to 'src')
| -rw-r--r-- | src/GameSpy/darray.c | 6 | ||||
| -rw-r--r-- | src/GameSpy/hashtable.c | 4 | ||||
| -rw-r--r-- | src/Runtime/ptmf.c (renamed from src/libstdc++/ptmf.c) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/GameSpy/darray.c b/src/GameSpy/darray.c index b179f37..7f84cb0 100644 --- a/src/GameSpy/darray.c +++ b/src/GameSpy/darray.c @@ -1,7 +1,7 @@ #include "types.h"
-#include "qsort.h"
-#include "nonport.h"
-#include "darray.h"
+#include "libstdc++/qsort.h"
+#include "GameSpy/nonport.h"
+#include "GameSpy/darray.h"
#pragma auto_inline on
diff --git a/src/GameSpy/hashtable.c b/src/GameSpy/hashtable.c index d170aa7..0e1c09a 100644 --- a/src/GameSpy/hashtable.c +++ b/src/GameSpy/hashtable.c @@ -1,6 +1,6 @@ #include "types.h"
-#include "nonport.h"
-#include "hashtable.h"
+#include "GameSpy/nonport.h"
+#include "GameSpy/hashtable.h"
HashTable *TableNew(u32 p1, s32 p2, HashFunction hf, CompareFunction cmp, DtorFunction dtor)
{
diff --git a/src/libstdc++/ptmf.c b/src/Runtime/ptmf.c index 297039c..297039c 100644 --- a/src/libstdc++/ptmf.c +++ b/src/Runtime/ptmf.c |