[vlc-commits] include: fix clz on pure ISO C compilers

Rémi Denis-Courmont git at videolan.org
Sat Feb 24 08:58:06 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 24 09:53:54 2018 +0200| [4d1b85c2421f03ea328bd880ea3a6563771dc028] | committer: Rémi Denis-Courmont

include: fix clz on pure ISO C compilers

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

 include/vlc_common.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 27c19a7493..87196d295b 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -716,11 +716,11 @@ VLC_USED static inline int clzbits(unsigned long long x, int maxbits)
  */
 #  define clz(x) \
     _Generic((x), \
-        unsigned char: clzbits(x, char), \
-        unsigned short: clzbits(x, short), \
-        unsigned: clzbits(x, int), \
-        unsigned long: clzbits(x, long), \
-        unsigned long long: clzbits(x, long long))
+        unsigned char: clztype(x, char), \
+        unsigned short: clztype(x, short), \
+        unsigned: clztype(x, int), \
+        unsigned long: clztype(x, long), \
+        unsigned long long: clztype(x, long long))
 # endif
 
 /**
@@ -776,7 +776,7 @@ VLC_USED static inline int popcount(unsigned long long x)
           signed long:      popcount((unsigned long)(x)), \
         unsigned long long: popcount(x), \
           signed long long: popcount(x))
-#endif
+# endif
 
 /**
  * Parity



More information about the vlc-commits mailing list