vlc_commom Use ULL over LLU

Ref http://gcc.gnu.org/onlinedocs/gcc/Long-Long.html

Merging KDE patch to help integration
https://projects.kde.org/projects/kdesupport/emerge/repository/revisions/01bbd04bd25c5ff8022924870e234ccaa299a81a/entry/portage/binary/vlc/vlc-2.0.6.diff

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 18f1adc7c3d6aee64558771cf488ed494d167d72..d75f2167241eac43a132a197cea104b25e2e889a 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -611,14 +611,14 @@ static inline uint64_t bswap64 (uint64_t x)
          | ((x & 0x00FF000000000000) >> 40)
          | ((x & 0xFF00000000000000) >> 56);
 #else
-    return ((x & 0x00000000000000FFLLU) << 56)
-         | ((x & 0x000000000000FF00LLU) << 40)
-         | ((x & 0x0000000000FF0000LLU) << 24)
-         | ((x & 0x00000000FF000000LLU) <<  8)
-         | ((x & 0x000000FF00000000LLU) >>  8)
-         | ((x & 0x0000FF0000000000LLU) >> 24)
-         | ((x & 0x00FF000000000000LLU) >> 40)
-         | ((x & 0xFF00000000000000LLU) >> 56);
+    return ((x & 0x00000000000000FFULL) << 56)
+         | ((x & 0x000000000000FF00ULL) << 40)
+         | ((x & 0x0000000000FF0000ULL) << 24)
+         | ((x & 0x00000000FF000000ULL) <<  8)
+         | ((x & 0x000000FF00000000ULL) >>  8)
+         | ((x & 0x0000FF0000000000ULL) >> 24)
+         | ((x & 0x00FF000000000000ULL) >> 40)
+         | ((x & 0xFF00000000000000ULL) >> 56);
 #endif
 }