[vlc-commits] inline is inline

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  5 15:10:23 2011 +0200| [9cbf9c3b160883497d4e75ecb187f110068b2dc6] | committer: Rémi Denis-Courmont

inline is inline

We assume C99 nowadays.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9cbf9c3b160883497d4e75ecb187f110068b2dc6
---

 include/vlc_common.h     |    1 -
 modules/access/dvb/dvb.h |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 2fbcdc3..a1dbcf3 100644
--- 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 bf059d0..90f3aaa 100644
--- 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;