diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
| commit | 599347b9c9b448d03dc58fc95df88267c744aa29 (patch) | |
| tree | 75a70a2c16d7fcc77a747d532b7be4a38709cf0a /code/qcommon/files.c | |
| parent | 6e6bab9af628a899fca58dffc42c2ebb09eceb69 (diff) | |
| download | ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.tar.gz ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.zip | |
* (bug #3729) server dependencies on client.h (Ben Millwood)
* (bug #3731) BUILD_MISSIONPACK flag in Makefile (Gabriel Schnoering
<gabriel.schnoering@gmail.com>)
* (bug #3756) Q3VM crashes on unaligned block copy with SIGBUS (Patrick Baggett
<baggett.patrick@figglesoftware.com>) and...
* (bug #3755) IOQuake3 shouldn't use GCC-specific __FUNCTION__
git-svn-id: svn://svn.icculus.org/quake3/trunk@1456 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/files.c')
| -rw-r--r-- | code/qcommon/files.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 821de07..88df191 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -298,6 +298,11 @@ char lastValidGame[MAX_OSPATH]; FILE* missingFiles = NULL; #endif +/* C99 defines __func__ */ +#ifndef __func__ +#define __func__ "(unknown)" +#endif + /* ============== FS_Initialized @@ -526,7 +531,7 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) { Com_Printf( "copy %s to %s\n", fromOSPath, toOSPath ); - FS_FilenameIsExecutable( toOSPath, __FUNCTION__ ); + FS_FilenameIsExecutable( toOSPath, __func__ ); if (strstr(fromOSPath, "journal.dat") || strstr(fromOSPath, "journaldata.dat")) { Com_Printf( "Ignoring journal files\n"); @@ -569,7 +574,7 @@ FS_Remove =========== */ void FS_Remove( const char *osPath ) { - FS_FilenameIsExecutable( osPath, __FUNCTION__ ); + FS_FilenameIsExecutable( osPath, __func__ ); remove( osPath ); } @@ -581,7 +586,7 @@ FS_HomeRemove =========== */ void FS_HomeRemove( const char *homePath ) { - FS_FilenameIsExecutable( homePath, __FUNCTION__ ); + FS_FilenameIsExecutable( homePath, __func__ ); remove( FS_BuildOSPath( fs_homepath->string, fs_gamedir, homePath ) ); @@ -660,7 +665,7 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) { Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath ); } - FS_FilenameIsExecutable( ospath, __FUNCTION__ ); + FS_FilenameIsExecutable( ospath, __func__ ); if( FS_CreatePath( ospath ) ) { return 0; @@ -771,7 +776,7 @@ void FS_SV_Rename( const char *from, const char *to ) { Com_Printf( "FS_SV_Rename: %s --> %s\n", from_ospath, to_ospath ); } - FS_FilenameIsExecutable( to_ospath, __FUNCTION__ ); + FS_FilenameIsExecutable( to_ospath, __func__ ); if (rename( from_ospath, to_ospath )) { // Failed, try copying it and deleting the original @@ -805,7 +810,7 @@ void FS_Rename( const char *from, const char *to ) { Com_Printf( "FS_Rename: %s --> %s\n", from_ospath, to_ospath ); } - FS_FilenameIsExecutable( to_ospath, __FUNCTION__ ); + FS_FilenameIsExecutable( to_ospath, __func__ ); if (rename( from_ospath, to_ospath )) { // Failed, try copying it and deleting the original @@ -868,7 +873,7 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) { Com_Printf( "FS_FOpenFileWrite: %s\n", ospath ); } - FS_FilenameIsExecutable( ospath, __FUNCTION__ ); + FS_FilenameIsExecutable( ospath, __func__ ); if( FS_CreatePath( ospath ) ) { return 0; @@ -916,7 +921,7 @@ fileHandle_t FS_FOpenFileAppend( const char *filename ) { Com_Printf( "FS_FOpenFileAppend: %s\n", ospath ); } - FS_FilenameIsExecutable( ospath, __FUNCTION__ ); + FS_FilenameIsExecutable( ospath, __func__ ); if( FS_CreatePath( ospath ) ) { return 0; |