Fix issues building on Solaris 10

Author: k0ekk0ek

CMakeLists.txt

@@ -169,7 +169,7 @@ target_link_libraries(zone-bench PRIVATE zone)
 check_include_file(endian.h HAVE_ENDIAN_H)
 
 check_include_file(unistd.h HAVE_UNISTD_H)
-check_symbol_exists(getopt unistd.h HAVE_GETOPT)
+check_symbol_exists(getopt "stdio.h;unistd.h" HAVE_GETOPT)
 if(NOT HAVE_UNISTD_H OR NOT HAVE_GETOPT)
   target_include_directories(
     zone-bench PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/compat>)

src/attributes.h

@@ -64,8 +64,13 @@
 #   define no_sanitize_undefined
 # endif
 
-# define likely(params) __builtin_expect(!!(params), 1)
-# define unlikely(params) __builtin_expect(!!(params), 0)
+# if has_builtin(__builtin_expect)
+#   define likely(params) __builtin_expect(!!(params), 1)
+#   define unlikely(params) __builtin_expect(!!(params), 0)
+# else
+#   define likely(params) (params)
+#   define unlikely(params) (params)
+# endif
 #endif
 
 #endif // ATTRIBUTES_H

src/config.h.in

@@ -1,3 +1,6 @@
+/* Wether or not we have getopt */
+#undef HAVE_GETOPT
+
 /* Wether or not have the <endian.h> header file */
 #undef HAVE_ENDIAN_H