aboutsummaryrefslogtreecommitdiffstats
path: root/src/gcc.h
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-30 08:47:50 +0000
committerEric Wong <normalperson@yhbt.net>2006-07-30 08:47:50 +0000
commite86fd65c81be319c8f4848d42053084ceab9afc8 (patch)
treee31337fe239384bab16b7b889b90075fa3f8b5b9 /src/gcc.h
parenta0c8e3656ba1c7c796f47f7d020f448961b1b3c5 (diff)
downloadmpd-e86fd65c81be319c8f4848d42053084ceab9afc8.tar.gz
mpd-e86fd65c81be319c8f4848d42053084ceab9afc8.tar.xz
mpd-e86fd65c81be319c8f4848d42053084ceab9afc8.zip
commandError() cleanups, fixup gcc checks
stripped binary size reduced by 9k on my machine from making commandError a function. We'll print out error messages slightly slower before, but the smaller binary is more than worth it. git-svn-id: https://svn.musicpd.org/mpd/trunk@4488 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/gcc.h')
-rw-r--r--src/gcc.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gcc.h b/src/gcc.h
index 62c78e733..4b4fe4cd4 100644
--- a/src/gcc.h
+++ b/src/gcc.h
@@ -8,7 +8,7 @@
*/
/* disabled (0) until I fix all the warnings :) */
-#if (0 && __GNUC__ >= 3)
+#if __GNUC__ >= 3
# define mpd_const __attribute__ ((const))
# define mpd_deprecated __attribute__ ((deprecated))
# define mpd_malloc __attribute__ ((malloc))
@@ -25,8 +25,8 @@
# define mpd_used __attribute__ ((used))
/* # define inline inline __attribute__ ((always_inline)) */
# define mpd_noinline __attribute__ ((noinline))
-# define likely(x) __builtin_expect (!!(x), 1)
-# define unlikely(x) __builtin_expect (!!(x), 0)
+# define mpd_likely(x) __builtin_expect (!!(x), 1)
+# define mpd_unlikely(x) __builtin_expect (!!(x), 0)
#else
# define mpd_const
# define mpd_deprecated
@@ -43,8 +43,8 @@
# define mpd_used
/* # define inline */
# define mpd_noinline
-# define likely(x) (x)
-# define unlikely(x) (x)
+# define mpd_likely(x) (x)
+# define mpd_unlikely(x) (x)
#endif
#endif /* MPD_GCC_H */