fixes to make Newer compile with Clang... kinda

2 files changed, 9 insertions, 7 deletions

diff --git a/include/common.h b/include/common.h
index a070a56..5b85824 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,6 +23,8 @@ typedef unsigned int uint;
 typedef unsigned short ushort;

 typedef unsigned char uchar;

 

+typedef unsigned long size_t;

+

 typedef char* Ptr; // DUMB

 

 typedef int BOOL;

@@ -52,7 +54,7 @@ extern "C" int strcmp ( const char * str1, const char * str2 );
 #include "rvl/mtx.h"

 

 

-inline void *operator new(unsigned long size, void *ptr) { return ptr; }

+inline void *operator new(size_t size, void *ptr) { return ptr; }

 

 

 

@@ -78,10 +80,10 @@ struct tree_node {
 

 void OSReport(const char *format, ...);

 int sprintf(char *buffer, const char *format, ...);

-int snprintf(char *buffer, int buff_size, const char *format, ...);

-char *strcat(const char *destination, const char *source);

-void *memset(void *ptr, int value, unsigned int num);

-int memcmp(const void *ptr1, const void *ptr2, unsigned int num);

+int snprintf(char *buffer, size_t buff_size, const char *format, ...);

+char *strcat(char *destination, const char *source);

+void *memset(void *ptr, int value, size_t num);

+int memcmp(const void *ptr1, const void *ptr2, size_t num);

 

 void *AllocFromGameHeap1(u32 size);

 void FreeFromGameHeap1(void *block);

diff --git a/include/game.h b/include/game.h
index 63a076c..2e49ac4 100755
--- a/include/game.h
+++ b/include/game.h
@@ -1521,10 +1521,10 @@ template <class TOwner>
 class dStateWrapper_c : public dStateWrapperBase_c<TOwner> {

 public:

 	dStateWrapper_c(TOwner *pOwner) :

-		dStateWrapperBase_c(pOwner) { }

+		dStateWrapperBase_c<TOwner>(pOwner) { }

 

 	dStateWrapper_c(TOwner *pOwner, dState_c<TOwner> *pInitState) :

-		dStateWrapperBase_c(pOwner, pInitState) { }

+		dStateWrapperBase_c<TOwner>(pOwner, pInitState) { }

 

 	~dStateWrapper_c() { }

 };