Changeset 10f924c for libwandio/wandio.h

Timestamp:

05/23/14 17:31:26 (8 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

2a7047c

Parents:

d3b6b91

Message:

Fixed broken -fvisibility check in configure

• Added a m4 script that does this properly rather than our hax gcc version check.
• Tidied up CFLAGS in configure so we aren't adding the same sets of flags multiple times
• Created a wandio_internal.h file for storing global variables that shouldn't be made public

Thanks to Alistair King, whose patch to try and make this work for
non-gcc systems brought my attention to just how broken this was :)

File:

• libwandio/wandio.h (modified) (3 diffs)

libwandio/wandio.h

@@ -34 +34 @@
 #ifndef IO_H 
 #define IO_H 1 /**< Guard Define */
-#include "config.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -40 +39 @@
 #include <stdbool.h>
 
-#if __GNUC__ >= 4
-        #ifdef LT_BUILDING_DLL
-                #define DLLEXPORT __attribute__ ((visibility("default")))
-                #define DLLLOCAL __attribute__ ((visibility("hidden")))
-        #else
-                #define DLLEXPORT
-                #define DLLLOCAL
-        #endif
-#else
-        #define DLLEXPORT
-        #define DLLLOCAL
+
+#ifndef DLLEXPORT
+        #if HAVE_VISIBILITY && LT_BUILDING_DLL
+                #define DLLEXPORT __attribute__ ((visibility("default")))
+                #define DLLLOCAL __attribute__ ((visibility("hidden")))
+        #else
+                #define DLLEXPORT
+                #define DLLLOCAL
+        #endif
 #endif
 
+// TODO: Use a proper check for these attribute rather than gcc version check
 #if __GNUC__ >= 3 
 #  define DEPRECATED __attribute__((deprecated))
@@ -330 +328 @@
 /** @} */
 
-/** @name libtraceio options 
- * @{ */
-extern int force_directio_read;
-extern int force_directio_write;
-extern uint64_t write_waits;
-extern uint64_t read_waits;
-extern unsigned int use_threads;
-extern unsigned int max_buffers;
-/* @} */
-
 #endif