diff options
| author | six <six@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-04 05:19:58 +0000 |
|---|---|---|
| committer | six <six@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-04 05:19:58 +0000 |
| commit | 983705a1982e3280b4b29e4cd2606527583040bc (patch) | |
| tree | 2e6ca884ced16ca882e5da3587232eb78d95d336 | |
| parent | 92e518e67dd6e152ac053ccf2a037967de060b5b (diff) | |
| download | ioquake3-aero-983705a1982e3280b4b29e4cd2606527583040bc.tar.gz ioquake3-aero-983705a1982e3280b4b29e4cd2606527583040bc.zip | |
Changed inline to __inline.
Visual C does not accept the inline keyword, only __inline.
Visual C does not recognize the #warning compiler directive
git-svn-id: svn://svn.icculus.org/quake3/trunk@78 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/qcommon/files.c | 4 | ||||
| -rw-r--r-- | code/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | code/renderer/tr_main.c | 2 | ||||
| -rw-r--r-- | code/renderer/tr_shader.c | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 942bf24..86744e5 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2837,12 +2837,12 @@ if the full version is not found */ static void FS_SetRestrictions( void ) { searchpath_t *path; + char *productId; Com_Printf("smells like demo data, continueing anyways\n"); - return; +// return; #ifndef PRE_RELEASE_DEMO - char *productId; // if fs_restrict is set, don't even look for the id file, // which allows the demo release to be tested even if diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index 2295f56..a99bfcf 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -326,7 +326,7 @@ void *VM_ArgPtr( long intValue ); void *VM_ExplicitArgPtr( vm_t *vm, long intValue ); #define VMA(x) VM_ArgPtr(args[x]) -static inline float _vmf(long x) +static __inline float _vmf(long x) { union { long l; diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c index 348c742..536cb5a 100644 --- a/code/renderer/tr_main.c +++ b/code/renderer/tr_main.c @@ -1005,7 +1005,7 @@ qsort replacement ================= */ -static inline void SWAP_DRAW_SURF(drawSurf_t* a, drawSurf_t* b) +static __inline void SWAP_DRAW_SURF(drawSurf_t* a, drawSurf_t* b) { drawSurf_t t; memcpy(&t, a, sizeof(t)); diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c index b99ea1b..5376fa2 100644 --- a/code/renderer/tr_shader.c +++ b/code/renderer/tr_shader.c @@ -43,7 +43,9 @@ static char **shaderTextHashTable[MAX_SHADERTEXT_HASH]; return a hash value for the filename ================ */ -#warning TODO: check if long is ok here +#ifdef __GNUCC__ + #warning TODO: check if long is ok here +#endif static long generateHashValue( const char *fname, const int size ) { int i; long hash; |