1 files changed, 12 insertions, 6 deletions

diff --git a/luaconf.h b/luaconf.h
index ae73e2fd..38e14eda 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -665,20 +665,26 @@
 ** macros to improve jump prediction, used mostly for error handling
 ** and debug facilities.
 */
-#if (defined(LUA_CORE) || defined(LUA_LIB)) && !defined(l_likely)
+#if !defined(luai_likely)
 
-#include <stdio.h>
 #if defined(__GNUC__)
-#define l_likely(x)     (__builtin_expect(((x) != 0), 1))
-#define l_unlikely(x)   (__builtin_expect(((x) != 0), 0))
+#define luai_likely(x)          (__builtin_expect(((x) != 0), 1))
+#define luai_unlikely(x)        (__builtin_expect(((x) != 0), 0))
 #else
-#define l_likely(x)     (x)
-#define l_unlikely(x)   (x)
+#define luai_likely(x)          (x)
+#define luai_unlikely(x)        (x)
 #endif
 
 #endif
 
 
+#if defined(LUA_CORE) || defined(LUA_LIB)
+/* shorter names for Lua's own use */
+#define l_likely(x)     luai_likely(x)
+#define l_unlikely(x)   luai_unlikely(x)
+#endif
+
+
 
 /* }================================================================== */