diff --git a/common/port.h b/common/port.h index 8847eb0f..defb7ff9 100644 --- a/common/port.h +++ b/common/port.h @@ -37,7 +37,6 @@ GNU General Public License for more details. // Windows-specific #define __cdecl #define __stdcall - #define _inline static inline #if XASH_POSIX #include diff --git a/engine/client/mod_dbghulls.c b/engine/client/mod_dbghulls.c index 6db4b461..80a7af51 100644 --- a/engine/client/mod_dbghulls.c +++ b/engine/client/mod_dbghulls.c @@ -41,7 +41,7 @@ GNU General Public License for more details. #define LIST_HEAD_INIT( name ) { &(name), &(name) } -_inline void list_add__( hullnode_t *new, hullnode_t *prev, hullnode_t *next ) +static inline void list_add__( hullnode_t *new, hullnode_t *prev, hullnode_t *next ) { next->prev = new; new->next = next; @@ -50,18 +50,18 @@ _inline void list_add__( hullnode_t *new, hullnode_t *prev, hullnode_t *next ) } // add the new entry after the give list entry -_inline void list_add( hullnode_t *newobj, hullnode_t *head ) +static inline void list_add( hullnode_t *newobj, hullnode_t *head ) { list_add__( newobj, head, head->next ); } // add the new entry before the given list entry (list is circular) -_inline void list_add_tail( hullnode_t *newobj, hullnode_t *head ) +static inline void list_add_tail( hullnode_t *newobj, hullnode_t *head ) { list_add__( newobj, head->prev, head ); } -_inline void list_del( hullnode_t *entry ) +static inline void list_del( hullnode_t *entry ) { entry->next->prev = entry->prev; entry->prev->next = entry->next; diff --git a/engine/client/soundlib/libmpg/sample.h b/engine/client/soundlib/libmpg/sample.h index 0b33c96b..18f67541 100644 --- a/engine/client/soundlib/libmpg/sample.h +++ b/engine/client/soundlib/libmpg/sample.h @@ -20,7 +20,7 @@ GNU General Public License for more details. #ifdef IEEE_FLOAT // rhis function is only available for IEEE754 single-precision values // rhis is nearly identical to proper rounding, just -+0.5 is rounded to 0 -static _inline int16_t ftoi16( float x ) +static inline int16_t ftoi16( float x ) { union {