From 9097a93366e681a79f4ba26b64183a7bb9c573de Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 7 Mar 2016 20:42:40 +0100
Subject: [PATCH] remove internal definitions from public config header

---
 include/simgrid_config.h.in                | 12 +-----------
 include/smpi/smpi.h                        |  3 ---
 include/xbt/mmalloc.h                      |  2 +-
 src/simix/RawContext.cpp                   |  8 +++++---
 src/xbt/automaton/automatonparse_promela.c |  1 +
 src/xbt/mmalloc/mm_module.c                |  1 +
 src/xbt/mmalloc/mmorecore.c                |  1 +
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index f310d592bf..a33a432f0a 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -21,26 +21,16 @@
 #define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
 #define SIMGRID_VERSION_BANNER "@SIMGRID_VERSION_BANNER@"
 
-/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
- * (with Y and Z must be on two positions)*/
+/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots (with Y and Z must be on two positions) */
 #define MAKE_SIMGRID_VERSION(major, minor, patch)   (100UL * (100UL * (major) + (minor)) + (patch))
 #define SIMGRID_VERSION MAKE_SIMGRID_VERSION(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH)
 
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
-
 /* Whether mallocators were enabled in ccmake or not. */
 #define MALLOCATOR_COMPILED_IN @MALLOCATOR_IS_WANTED@
 
-/* Define if xbt contexts are based on our threads implementation or not */
-#cmakedefine HAVE_THREAD_CONTEXTS @HAVE_THREAD_CONTEXTS@
-
 /* If __thread is available */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@
 
-/* Define to 1 if mmalloc is compiled in. */
-#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
-
 #cmakedefine HAVE_JEDULE @HAVE_JEDULE@ /* Was Jedule compiled in?  */
 #cmakedefine HAVE_MC     @HAVE_MC@     /* Was the model-checking compiled in? */
 #cmakedefine HAVE_NS3    @HAVE_NS3@    /* Was the NS3 support compiled in? */
diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index e3eeca72f6..eaf101bc36 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -7,10 +7,7 @@
 #ifndef SMPI_H
 #define SMPI_H
 
-#include <simgrid_config.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <sys/time.h>
 
 #include <stddef.h>
diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 419a836d4b..fb62d48efc 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -10,7 +10,7 @@
 #ifndef MMALLOC_H
 #define MMALLOC_H 1
 
-#include <simgrid_config.h>
+#include "src/internal_config.h"
 #ifdef HAVE_MMALLOC
 
 #ifdef HAVE_STDDEF_H
diff --git a/src/simix/RawContext.cpp b/src/simix/RawContext.cpp
index d131015e5a..96cedd1d7b 100644
--- a/src/simix/RawContext.cpp
+++ b/src/simix/RawContext.cpp
@@ -16,9 +16,11 @@
 #include <utility>
 #include <functional>
 
-#include <xbt/log.h>
-#include <xbt/parmap.h>
-#include <xbt/dynar.h>
+#include "src/internal_config.h" 
+
+#include "xbt/log.h"
+#include "xbt/parmap.h"
+#include "xbt/dynar.h"
 
 #include "smx_private.h"
 #include "smx_private.hpp"
diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 44758e34a2..2ed7b560a2 100644
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -7,6 +7,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/automaton.h"
+#include "src/internal_config.h"
 #include <errno.h>
 #include <string.h>             /* strerror */
 
diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index 344023658c..fea22d3e53 100644
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -27,6 +27,7 @@
    not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include "src/internal_config.h"
 #include <sys/types.h>
 #include <fcntl.h>              /* After sys/types.h, at least for dpx/2.  */
 #include <sys/stat.h>
diff --git a/src/xbt/mmalloc/mmorecore.c b/src/xbt/mmalloc/mmorecore.c
index b99f32259e..e78ba90c54 100644
--- a/src/xbt/mmalloc/mmorecore.c
+++ b/src/xbt/mmalloc/mmorecore.c
@@ -10,6 +10,7 @@
 
    Contributed by Fred Fish at Cygnus Support.   fnf@cygnus.com */
 
+#include "src/internal_config.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>             /* Prototypes for lseek */
 #endif
-- 
2.20.1