From 030db5bb236344370342447d31a3d685dd93ad92 Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sun, 7 Jan 2007 05:38:12 +0000
Subject: compile fixes for gcc 4.0 / osx.

---
 src/win95/chnktexi.cpp | 6 +++---
 src/win95/our_mem.c    | 2 +-
 src/win95/string.cpp   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/win95')

diff --git a/src/win95/chnktexi.cpp b/src/win95/chnktexi.cpp
index 6487737..bae637b 100644
--- a/src/win95/chnktexi.cpp
+++ b/src/win95/chnktexi.cpp
@@ -102,7 +102,7 @@ static char * RiffBasename(Chunk_With_Children * pEnvDataChunk)
 #if CL_SUPPORT_FASTFILE
 static inline bool IsFileInFastFile(char const * pszFileName)
 {
-	unsigned nLen;
+	size_t nLen;
 	return ffreadbuf(pszFileName,&nLen) ? true : false;
 }
 #endif
@@ -714,7 +714,7 @@ int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
 		case LIO_DDSURFACE:
 		{
 			#if CL_SUPPORT_FASTFILE
-			unsigned nFastFileLen;
+			size_t nFastFileLen;
 			void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen);
 			if (pFastFileData)
 			{
@@ -823,7 +823,7 @@ int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
 		{
 			fAwLoad |= AW_TLF_COMPRESS; // required on some cards!!
 			#if CL_SUPPORT_FASTFILE
-			unsigned nFastFileLen;
+			size_t nFastFileLen;
 			void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen);
 			if (pFastFileData)
 			{
diff --git a/src/win95/our_mem.c b/src/win95/our_mem.c
index 32a81ec..7764891 100644
--- a/src/win95/our_mem.c
+++ b/src/win95/our_mem.c
@@ -1,6 +1,6 @@
 #include "3dc.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 
 #define UseLocalAssert  No
 
diff --git a/src/win95/string.cpp b/src/win95/string.cpp
index 4ea96b5..6a17a8e 100644
--- a/src/win95/string.cpp
+++ b/src/win95/string.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "string.hpp"
 
 String::String()
-- 
cgit v1.3