Mercurial > mplayer.hg

changeset 25847:fe50eaad932d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the standard "static inline" instead of some broken ifdef mess
author reimar
date Sun, 27 Jan 2008 11:25:45 +0000
parents f3ae700cc317
children 09056d54cdee
files tremor/os.h tremor/tremor.diff
diffstat 2 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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 <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)
--- 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 <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