diff options
| author | Steven Fuller <relnev@icculus.org> | 2007-01-07 05:38:12 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 030db5bb236344370342447d31a3d685dd93ad92 (patch) | |
| tree | 1cae501851965c7536077817c157a60cdb53a0f5 | |
| parent | d9a250e1dfd9ed24ce5b0f3d5baa85e0b57b3d55 (diff) | |
compile fixes for gcc 4.0 / osx.
| -rw-r--r-- | src/avp/win95/progress_bar.cpp | 6 | ||||
| -rw-r--r-- | src/mathline.c | 2 | ||||
| -rw-r--r-- | src/win95/chnktexi.cpp | 6 | ||||
| -rw-r--r-- | src/win95/our_mem.c | 2 | ||||
| -rw-r--r-- | src/win95/string.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/avp/win95/progress_bar.cpp b/src/avp/win95/progress_bar.cpp index 78e81e6..2b2c3a9 100644 --- a/src/avp/win95/progress_bar.cpp +++ b/src/avp/win95/progress_bar.cpp @@ -59,7 +59,7 @@ void Start_Progress_Bar() CL_GetImageFileName(buffer, 100,Loading_Bar_Empty_Image_Name, LIO_RELATIVEPATH); //see if graphic can be found in fast file - unsigned int fastFileLength; + size_t fastFileLength; void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); if(pFastFileData) @@ -89,7 +89,7 @@ void Start_Progress_Bar() CL_GetImageFileName(buffer, 100,Loading_Bar_Full_Image_Name, LIO_RELATIVEPATH); //see if graphic can be found in fast file - unsigned int fastFileLength; + size_t fastFileLength; void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); if(pFastFileData) @@ -128,7 +128,7 @@ void Start_Progress_Bar() //see if graphic can be found in fast file - unsigned int fastFileLength; + size_t fastFileLength; void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); if(pFastFileData) diff --git a/src/mathline.c b/src/mathline.c index c6654a4..d01596a 100644 --- a/src/mathline.c +++ b/src/mathline.c @@ -209,7 +209,7 @@ int CMP_LL(LONGLONGCH *a, LONGLONGCH *b) llgs: } */ -#if 1 +#if 0 int retval; __asm__("movl 0(%%ebx), %%eax \n\t" 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() |