From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 6 Mar 2016 22:03:29 +0000 (+0100)
Subject: sys/time.h is always defined nowadays
X-Git-Tag: v3_13~522^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3f485ca36d11ca7dda9a469b81265705f0e7749b?ds=sidebyside

sys/time.h is always defined nowadays
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e68ce76e7..24dee6b9cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,7 +283,6 @@ CHECK_INCLUDE_FILE("sys/ptrace.h" HAVE_SYS_PTRACE_H)
 CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
-CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
 CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
@@ -928,7 +927,6 @@ message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_H}")
 message("HAVE_UNISTD_H ...............: ${HAVE_UNISTD_H}")
 message("HAVE_EXECINFO_H .............: ${HAVE_EXECINFO_H}")
 message("HAVE_SIGNAL_H ...............: ${HAVE_SIGNAL_H}")
-message("HAVE_SYS_TIME_H .............: ${HAVE_SYS_TIME_H}")
 message("HAVE_DLFCN_H ................: ${HAVE_DLFCN_H}")
 
 message("")
diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 10f75e0c05..f310d592bf 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,7 +1,6 @@
 /* simgrid_config.h - Results of the configure made visible to user code    */
 
-/* Copyright (c) 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -20,24 +19,16 @@
 #define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
 
 #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)*/
-
-#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 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@
 
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@
-
 /* Whether mallocators were enabled in ccmake or not. */
 #define MALLOCATOR_COMPILED_IN @MALLOCATOR_IS_WANTED@
 
diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index c40829ce72..e3eeca72f6 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -11,9 +11,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
 
 #include <stddef.h>
 #include <xbt/misc.h>
diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 28e76d6055..bb32dba5c4 100644
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -7,7 +7,7 @@
 #ifndef MC_DATATYPE_H
 #define MC_DATATYPE_H
 
-#include <simgrid_config.h>
+#include <src/internal_config.h>
 #include <xbt/base.h>
 
 #ifdef HAVE_UCONTEXT_H
diff --git a/src/portable.h b/src/portable.h
index 9e5adda52f..486687118a 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,8 +1,6 @@
-/* portable -- header loading to write portable code                         */
-/* loads much more stuff than sysdep.h since the latter is in public interface*/
+/* portable -- header loading to write portable code within SimGrid         */
 
-/* Copyright (c) 2004-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004, 2016. The SimGrid Team. All rights reserved.         */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -33,9 +31,7 @@
 # include <sys/sysctl.h>
 #endif
 
-/****
- **** File handling
- ****/
+/* File handling */
 
 #include <fcntl.h>
 
@@ -67,18 +63,11 @@
 #  define O_BINARY 0
 #endif
 
-/****
- **** Time handling
- ****/
-
-#if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
+/* Time handling */
+#include <sys/time.h>
 #include <time.h>
 
-/****
- **** Signals
- ****/
+/* Signals */
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index a9a62edddf..3d3f0f1f85 100644
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -102,9 +102,6 @@
 /* Define to 1 if you have the <sys/ptrace.h> header file. */
 #cmakedefine HAVE_SYS_PTRACE_H @HAVE_SYS_PTRACE_H@
 
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@