Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
 src/openvpn/basic.h   |    9 +++++++++
 src/openvpn/syshead.h |    9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/openvpn/basic.h b/src/openvpn/basic.h
index 298cf10..f2d5041 100644
--- a/src/openvpn/basic.h
+++ b/src/openvpn/basic.h
@@ -35,4 +35,13 @@

 #define IPV4_NETMASK_HOST 0xffffffffU

+/* branch prediction hints */
+#if defined(__GNUC__)
+# define likely(x)       __builtin_expect((x),1)
+# define unlikely(x)     __builtin_expect((x),0)
+#else
+# define likely(x)      (x)
+# define unlikely(x)    (x)
+#endif
+
 #endif
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 3e64936..98d6023 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -28,15 +28,6 @@
 #include "compat.h"
 #include "compat-stdbool.h"

-/* branch prediction hints */
-#if defined(__GNUC__)
-# define likely(x)       __builtin_expect((x),1)
-# define unlikely(x)     __builtin_expect((x),0)
-#else
-# define likely(x)      (x)
-# define unlikely(x)    (x)
-#endif
-
 #ifdef WIN32
 #include <windows.h>
 #include <winsock2.h>
-- 
1.7.3.4


Reply via email to