Cleanup some unused and/or useless build config variables.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 935710a..8fc0284 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,15 +339,11 @@ endif()
 
 CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_H)
 CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
-CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
-CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
-CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
 CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
 
 CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
-CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE)
 CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
 CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV)
 CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)

diff --git a/src/internal_config.h.in b/src/internal_config.h.in
index 16e258a..3000c07 100644 (file)
--- a/src/internal_config.h.in
+++ b/src/internal_config.h.in
@@ -13,8 +13,6 @@
 /* Non-standard header files */
 /* <linux/futex.h> */
 #cmakedefine01 HAVE_FUTEX_H
-/* <signal.h> */
-#cmakedefine01 HAVE_SIGNAL_H
 /* <unistd.h> */
 #cmakedefine01 HAVE_UNISTD_H
 /* <ucontext.h> */
@@ -60,8 +58,6 @@
 #define PTH_STACKGROWTH @PTH_STACKGROWTH@
 
 /* MC variables */
-/* getdtablesize: get descriptor table size */
-#cmakedefine01 HAVE_GETDTABLESIZE
 /* Did we compile mmalloc in? */
 #cmakedefine01 HAVE_MMALLOC
 /* process_vm_readv: transfer data between process address spaces */
@@ -97,8 +93,6 @@
 /* Other checks */
 /* The graphviz library */
 #cmakedefine01 HAVE_GRAPHVIZ
-/* The lib unwind library (for MC and backtrace display) */
-#cmakedefine01 HAVE_LIBUNWIND
 /* The boost_stacktrace_backtrace library */
 #cmakedefine01 HAVE_BOOST_STACKTRACE_BACKTRACE /* preferred */
 #cmakedefine01 HAVE_BOOST_STACKTRACE_ADDR2LINE /* fallback */

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index b93b4d4..9866448 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -25,13 +25,7 @@
 #include <pthread.h>
 #include <stdint.h>
 
-#ifdef HAVE_LIMITS_H
-#  include <limits.h>
-#else
-#  ifndef CHAR_BIT
-#    define CHAR_BIT 8
-#  endif
-#endif
+#include <limits.h>
 
 #define MMALLOC_MAGIC    "mmalloc"       /* Mapped file magic number */
 #define MMALLOC_MAGIC_SIZE  8       /* Size of magic number buf */