# HG changeset patch # User reimar # Date 1201433145 0 # Node ID fe50eaad932dcf47e3e3cb2a140af0a2f7d37c52 # Parent f3ae700cc317f9cd69fcacb84b6ca693b2e1ed3c Use the standard "static inline" instead of some broken ifdef mess diff -r f3ae700cc317 -r fe50eaad932d tremor/os.h --- a/tremor/os.h Sun Jan 27 09:08:54 2008 +0000 +++ b/tremor/os.h Sun Jan 27 11:25:45 2008 +0000 @@ -20,17 +20,7 @@ #include #include "os_types.h" -#ifndef _V_IFDEFJAIL_H_ -# define _V_IFDEFJAIL_H_ - -# ifdef __GNUC__ -# define STIN static __inline__ -# elif _WIN32 -# define STIN static __inline -# endif -#else -# define STIN static -#endif +#define STIN static inline #ifndef M_PI # define M_PI (3.1415926536f) diff -r f3ae700cc317 -r fe50eaad932d tremor/tremor.diff --- a/tremor/tremor.diff Sun Jan 27 09:08:54 2008 +0000 +++ b/tremor/tremor.diff Sun Jan 27 11:25:45 2008 +0000 @@ -184,3 +184,25 @@ static int ilog(unsigned int v){ int ret=0; +--- os.h (revision 25873) ++++ os.h (working copy) +@@ -20,18 +20,8 @@ + #include + #include "os_types.h" + +-#ifndef _V_IFDEFJAIL_H_ +-# define _V_IFDEFJAIL_H_ ++#define STIN static inline + +-# ifdef __GNUC__ +-# define STIN static __inline__ +-# elif _WIN32 +-# define STIN static __inline +-# endif +-#else +-# define STIN static +-#endif +- + #ifndef M_PI + # define M_PI (3.1415926536f) + #endif