FIX eclipse-omr#59 : Use GNU feature macros before including any syst…

…em header files Signed-off-by: Andrew Young <[email protected]>
alin00 · Apr 5, 2016 · c103034 · c103034
1 parent b58fd61
commit c103034
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/port/linux/omrosbacktrace_impl.c b/port/linux/omrosbacktrace_impl.c
@@ -22,16 +22,16 @@
  * @brief Stack backtracing support
  */
 
+#define _GNU_SOURCE
+
 #include "omrport.h"
 #include "omrportpriv.h"
 #include "omrsignal_context.h"
 
+#include <dlfcn.h>
 #include <execinfo.h>
-#include <string.h>
 #include <stdlib.h>
-
-#define __USE_GNU 1
-#include <dlfcn.h>
+#include <string.h>
 
 #include "omrintrospect.h"
 

diff --git a/port/linux386/omrsignal_context.c b/port/linux386/omrsignal_context.c
@@ -16,9 +16,10 @@
  *    Multiple authors (IBM Corp.) - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-#include <unistd.h>
-#define __USE_GNU 1
+#define _GNU_SOURCE
+
 #include <sys/ucontext.h>
+#include <unistd.h>
 
 #include "omrport.h"
 #include "omrsignal_context.h"

diff --git a/port/linuxarm/omrsignal_context.c b/port/linuxarm/omrsignal_context.c
@@ -16,9 +16,10 @@
  *    Multiple authors (IBM Corp.) - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-#include <unistd.h>
-#define __USE_GNU 1
+#define _GNU_SOURCE
+
 #include <sys/ucontext.h>
+#include <unistd.h>
 
 #include "omrport.h"
 #include "omrsignal_context.h"

diff --git a/port/unix/omrintrospect.c b/port/unix/omrintrospect.c
@@ -25,7 +25,6 @@
 #if defined(LINUX)
 /* _GNU_SOURCE forces GLIBC_2.0 sscanf/vsscanf/fscanf for RHEL5 compatability */
 #define _GNU_SOURCE
-#define __USE_GNU 1
 #endif /* defined(LINUX) */
 
 #include <pthread.h>

diff --git a/util/omrutil/unix/linux/s390/archinfo.c b/util/omrutil/unix/linux/s390/archinfo.c
@@ -19,7 +19,7 @@
 /* _GNU_SOURCE forces GLIBC_2.0 sscanf/vsscanf/fscanf for RHEL5 compatability */
 #if defined(LINUX)
 #define _GNU_SOURCE
-#endif /* defined(__GNUC__) */
+#endif /* defined(LINUX) */
 
 #include <string.h>
 #include <stdio.h>