Skip to content

Commit

Permalink
Changed inline to __inline.
Browse files Browse the repository at this point in the history
Visual C does not accept the inline keyword, only __inline.

Visual C does not recognize the #warning compiler directive
  • Loading branch information
Six committed Sep 4, 2005
1 parent 0a8f2fe commit 38e3825
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/qcommon/files.c
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/qcommon/qcommon.h
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion code/renderer/tr_main.c
Expand Up @@ -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));
Expand Down
4 changes: 3 additions & 1 deletion code/renderer/tr_shader.c
Expand Up @@ -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;
Expand Down

0 comments on commit 38e3825

Please sign in to comment.