inline is inline

We assume C99 nowadays.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 2fbcdc3f85a742ff2743a414a4858fdb2cebe5ec..a1dbcf349ec773ce3ceef6260367475deba287b4 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -780,7 +780,6 @@ static inline uint64_t ntoh64 (uint64_t ll)
 /* win32, cl and icl support */
 #   if defined( _MSC_VER ) || !defined( __MINGW32__ )
 #       define __attribute__(x)
-#       define __inline__      __inline
 #       define S_IFBLK         0x3000  /* Block */
 #       define S_ISBLK(m)      (0)
 #       define S_ISCHR(m)      (0)

diff --git a/modules/access/dvb/dvb.h b/modules/access/dvb/dvb.h
index bf059d02a1e929a5628d1888b6ed2a6875002f5b..90f3aaa4f02678c20a752c3e4536735c8cb0dfd5 100644 (file)
--- a/modules/access/dvb/dvb.h
+++ b/modules/access/dvb/dvb.h
@@ -108,7 +108,7 @@ typedef struct en50221_mmi_object_t
     } u;
 } en50221_mmi_object_t;
 
-static __inline__ void en50221_MMIFree( en50221_mmi_object_t *p_object )
+static inline void en50221_MMIFree( en50221_mmi_object_t *p_object )
 {
     int i;