jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fixes for gcc 4.0 / osx.

Browse source
This commit is contained in:
Steven Fuller 2007-01-07 05:38:12 +00:00 • committed by Patryk Obara
parent d9a250e1df
commit 030db5bb23
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/avp/win95/progress_bar.cpp
View file

@ -59,7 +59,7 @@ void Start_Progress_Bar()
CL_GetImageFileName(buffer, 100,Loading_Bar_Empty_Image_Name, LIO_RELATIVEPATH); CL_GetImageFileName(buffer, 100,Loading_Bar_Empty_Image_Name, LIO_RELATIVEPATH);
//see if graphic can be found in fast file //see if graphic can be found in fast file
unsigned int fastFileLength; size_t fastFileLength;
void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); void const * pFastFileData = ffreadbuf(buffer,&fastFileLength);
if(pFastFileData) if(pFastFileData)
@ -89,7 +89,7 @@ void Start_Progress_Bar()
CL_GetImageFileName(buffer, 100,Loading_Bar_Full_Image_Name, LIO_RELATIVEPATH); CL_GetImageFileName(buffer, 100,Loading_Bar_Full_Image_Name, LIO_RELATIVEPATH);
//see if graphic can be found in fast file //see if graphic can be found in fast file
unsigned int fastFileLength; size_t fastFileLength;
void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); void const * pFastFileData = ffreadbuf(buffer,&fastFileLength);
if(pFastFileData) if(pFastFileData)
@ -128,7 +128,7 @@ void Start_Progress_Bar()
//see if graphic can be found in fast file //see if graphic can be found in fast file
unsigned int fastFileLength; size_t fastFileLength;
void const * pFastFileData = ffreadbuf(buffer,&fastFileLength); void const * pFastFileData = ffreadbuf(buffer,&fastFileLength);
if(pFastFileData) if(pFastFileData)

2
src/mathline.c
View file

@ -209,7 +209,7 @@ int CMP_LL(LONGLONGCH *a, LONGLONGCH *b)
llgs: llgs:
} }
*/ */
#if 1 #if 0
int retval; int retval;
__asm__("movl 0(%%ebx), %%eax \n\t" __asm__("movl 0(%%ebx), %%eax \n\t"

6
src/win95/chnktexi.cpp
View file

@ -102,7 +102,7 @@ static char * RiffBasename(Chunk_With_Children * pEnvDataChunk)
#if CL_SUPPORT_FASTFILE #if CL_SUPPORT_FASTFILE
static inline bool IsFileInFastFile(char const * pszFileName) static inline bool IsFileInFastFile(char const * pszFileName)
{ {
unsigned nLen; size_t nLen;
return ffreadbuf(pszFileName,&nLen) ? true : false; return ffreadbuf(pszFileName,&nLen) ? true : false;
} }
#endif #endif
@ -714,7 +714,7 @@ int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
case LIO_DDSURFACE: case LIO_DDSURFACE:
{ {
#if CL_SUPPORT_FASTFILE #if CL_SUPPORT_FASTFILE
unsigned nFastFileLen; size_t nFastFileLen;
void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen); void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen);
if (pFastFileData) if (pFastFileData)
{ {
@ -823,7 +823,7 @@ int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
{ {
fAwLoad |= AW_TLF_COMPRESS; // required on some cards!! fAwLoad |= AW_TLF_COMPRESS; // required on some cards!!
#if CL_SUPPORT_FASTFILE #if CL_SUPPORT_FASTFILE
unsigned nFastFileLen; size_t nFastFileLen;
void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen); void const * pFastFileData = ffreadbuf(szBuf,&nFastFileLen);
if (pFastFileData) if (pFastFileData)
{ {

2
src/win95/our_mem.c
View file

@ -1,6 +1,6 @@
#include "3dc.h" #include "3dc.h"
#include <malloc.h> #include <stdlib.h>
#define UseLocalAssert No #define UseLocalAssert No

2
src/win95/string.cpp
View file

@ -1,6 +1,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <malloc.h> #include <stdlib.h>
#include "string.hpp" #include "string.hpp"
String::String() String::String()