mirror of
https://github.com/mpv-player/mpv
synced 2024-09-05 02:48:21 +02:00
Use the standard "static inline" instead of some broken ifdef mess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25875 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e4cf805580
commit
63aadc8204
12
tremor/os.h
12
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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user