Revert "Bypass most checks performed via the inbuilt expect macros li…

…kely and unlikely for non-debug builds." This reverts commit 3a1d097. Did not offer any substantial speedup.
ckolivas · Mar 7, 2012 · 43402d1 · 43402d1
1 parent 3a1d097
commit 43402d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -80,7 +80,7 @@ AC_ARG_ENABLE([static-bin],
 	)
 AM_CONDITIONAL([STATIC], [test "x$static" = "xyes"])
 
-AC_ARG_ENABLE([debug],
+AC_ARG_ENABLE([debug-build],
 	[AC_HELP_STRING([--enable-debug],[Build debugging code in @<:@default=no@:>@])],
 	[debugbuild=$enableval]
 	)

diff --git a/lrzip_private.h b/lrzip_private.h
@@ -117,13 +117,8 @@ extern char *sys_errlist[];
 extern int errno;
 #endif
 
-#ifdef DEBUG_BUILD
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
-#else
-#define likely(x)	(x)) {}; if (true
-#define unlikely(x)	(x)) {}; if (false
-#endif
 #define __maybe_unused	__attribute__((unused))
 
 typedef long long int i64;