diff options
Diffstat (limited to 'tremor')
| -rw-r--r-- | tremor/os.h | 12 | ||||
| -rw-r--r-- | tremor/tremor.diff | 22 |
2 files changed, 23 insertions, 11 deletions
diff --git a/tremor/os.h b/tremor/os.h index 65a4992ffc..27f2a22e63 100644 --- a/tremor/os.h +++ b/tremor/os.h @@ -20,17 +20,7 @@ #include <math.h> #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 --git a/tremor/tremor.diff b/tremor/tremor.diff index 38c67596c7..7c92fb17a9 100644 --- a/tremor/tremor.diff +++ b/tremor/tremor.diff @@ -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 <math.h> + #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 |