From 5a8071fbd8b7f1e4b6695d332c3c6a774e6c55a6 Mon Sep 17 00:00:00 2001
From: "Julian M. Kunkel" <juliankunkel@googlemail.com>
Date: Sun, 28 Oct 2018 18:34:22 +0000
Subject: [PATCH] GNU99 extracted _XOPEN_SOURCE to config.h.

---
 configure.ac        | 10 +++-------
 src/aiori-DUMMY.c   |  2 --
 src/aiori-MMAP.c    |  2 --
 src/aiori.c         |  2 --
 src/ior.c           |  8 +++-----
 src/iordef.h        |  2 +-
 src/mdtest.c        |  2 --
 src/option.c        |  1 -
 src/parse_options.c |  7 +++++--
 9 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index c28fb71..002b2df 100755
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h strings.h sys/ioctl.h sys/
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_CHECK_FUNCS([getpagesize gettimeofday memset mkdir pow putenv realpath regcomp sqrt strcasecmp strchr strerror strncasecmp strstr uname statfs statvfs])
+AC_CHECK_FUNCS([sysconf gettimeofday memset mkdir pow putenv realpath regcomp sqrt strcasecmp strchr strerror strncasecmp strstr uname statfs statvfs])
 AC_SEARCH_LIBS([sqrt], [m], [],
         [AC_MSG_ERROR([Math library not found])])
 
@@ -76,6 +76,8 @@ AS_IF([test "$ac_cv_header_gpfs_h" = "yes" -o "$ac_cv_header_gpfs_fcntl_h" = "ye
 # Check for system capabilities
 AC_SYS_LARGEFILE
 
+AC_DEFINE([_XOPEN_SOURCE], [700], [C99 compatibility])
+
 # Check for lustre availability
 AC_ARG_WITH([lustre],
         [AS_HELP_STRING([--with-lustre],
@@ -254,12 +256,6 @@ Consider --with-aws4c=, CPPFLAGS, LDFLAGS, etc])
 ])
 
 
-
-
-
-
-
-
 # Enable building "IOR", in all capitals
 AC_ARG_ENABLE([caps],
         [AS_HELP_STRING([--enable-caps],
diff --git a/src/aiori-DUMMY.c b/src/aiori-DUMMY.c
index fd3b087..cfd920b 100755
--- a/src/aiori-DUMMY.c
+++ b/src/aiori-DUMMY.c
@@ -6,8 +6,6 @@
 #  include "config.h"
 #endif
 
-#define _XOPEN_SOURCE 700
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/aiori-MMAP.c b/src/aiori-MMAP.c
index ed04357..f812bdd 100644
--- a/src/aiori-MMAP.c
+++ b/src/aiori-MMAP.c
@@ -11,8 +11,6 @@
 #  include "config.h"
 #endif
 
-#define _XOPEN_SOURCE 700
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/aiori.c b/src/aiori.c
index 9c27386..1c3d6b8 100644
--- a/src/aiori.c
+++ b/src/aiori.c
@@ -16,8 +16,6 @@
 # include "config.h"
 #endif
 
-#define _XOPEN_SOURCE 700
-
 #include <assert.h>
 #include <stdbool.h>
 
diff --git a/src/ior.c b/src/ior.c
index d29ef3b..12b9390 100755
--- a/src/ior.c
+++ b/src/ior.c
@@ -12,8 +12,6 @@
 # include "config.h"
 #endif
 
-#define _XOPEN_SOURCE 700
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -466,10 +464,10 @@ static void *aligned_buffer_alloc(size_t size)
         char *buf, *tmp;
         char *aligned;
 
-#ifdef HAVE_GETPAGESIZE
-        size_t pageSize = getpagesize();
-#else
+#ifdef HAVE_SYSCONF
         long pageSize = sysconf(_SC_PAGESIZE);
+#else
+        size_t pageSize = getpagesize();
 #endif
 
         pageMask = pageSize - 1;
diff --git a/src/iordef.h b/src/iordef.h
index 0eea311..1d1f216 100755
--- a/src/iordef.h
+++ b/src/iordef.h
@@ -45,7 +45,7 @@
 #   define srandom srand
 #   define random() (rand() * (RAND_MAX+1) + rand())    /* Note: only 30 bits */
 #   define sleep(X) Sleep((X)*1000)
-#   define getpagesize() 4096
+#   define sysconf(X) 4096
 #else
 #   include <sys/param.h>                               /* MAXPATHLEN */
 #   include <unistd.h>
diff --git a/src/mdtest.c b/src/mdtest.c
index 147cf84..f7c4264 100644
--- a/src/mdtest.c
+++ b/src/mdtest.c
@@ -28,8 +28,6 @@
  *   $Date: 2013/11/27 17:05:31 $
  *   $Author: brettkettering $
  */
-#define _XOPEN_SOURCE 700
-
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/src/option.c b/src/option.c
index 5bd19fe..1e646af 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/parse_options.c b/src/parse_options.c
index 546d0dc..f0db71e 100755
--- a/src/parse_options.c
+++ b/src/parse_options.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define _XOPEN_SOURCE 700
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -53,7 +51,12 @@ static size_t NodeMemoryStringToBytes(char *size_str)
         if (percent > 100 || percent < 0)
                 ERR("percentage must be between 0 and 100");
 
+#ifdef HAVE_SYSCONF
         page_size = sysconf(_SC_PAGESIZE);
+#else
+        page_size = getpagesize();
+#endif
+
 #ifdef  _SC_PHYS_PAGES
         num_pages = sysconf(_SC_PHYS_PAGES);
         if (num_pages == -1)