Changeset 95911 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jul 28, 2022 1:05:29 PM (2 years ago)

Author:

vboxsync

Message:

Additions/x11: Build fix for missing _X_LIKELY and _X_UNLIKELY, bugref:8515

File:

• trunk/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h

@@ -64 +64 @@
 #include <stdint.h>
 #if defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
-/* XFree86 did not have these.  Not that I care much for micro-optimisations
- * in most cases anyway. */
-# define _X_LIKELY(x) (x)
-# define _X_UNLIKELY(x) (x)
 # ifndef offsetof
 #  define offsetof(type, member) ( (int)(uintptr_t)&( ((type *)(void *)0)->member) )
@@ -76 +72 @@
 # include <string.h>
 #endif  /* !(defined(IN_XF86_MODULE) && !defined(NO_ANSIC)) */
+
+/* XFree86 (and newer Xfuncproto.h) do not have these.  Not that I care much for micro-optimisations
+ * in most cases anyway. */
+#ifndef _X_LIKELY
+# define _X_LIKELY(x) (x)
+#endif
+#ifndef _X_UNLIKELY
+# define _X_UNLIKELY(x) (x)
+#endif
 
 RT_C_DECLS_BEGIN