[MPlayer-cvslog] r25875 - in trunk/tremor: os.h tremor.diff

[reimar]

Author: reimar
Date: Sun Jan 27 12:25:45 2008
New Revision: 25875

Log:
Use the standard "static inline" instead of some broken ifdef mess


Modified:
   trunk/tremor/os.h
   trunk/tremor/tremor.diff

Modified: trunk/tremor/os.h
==============================================================================
--- trunk/tremor/os.h	(original)
+++ trunk/tremor/os.h	Sun Jan 27 12:25:45 2008
@@ -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)

Modified: trunk/tremor/tremor.diff
==============================================================================
--- trunk/tremor/tremor.diff	(original)
+++ trunk/tremor/tremor.diff	Sun Jan 27 12:25:45 2008
@@ -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