From: ayin <ayin>
Date: Tue, 11 Dec 2007 17:42:04 +0000 (+0000)
Subject: Headers cleanup.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a0dd589531584a5298b630ffcaa6d09e917494e6;p=dana%2Furxvt.git

Headers cleanup.
---

diff --git a/configure.ac b/configure.ac
index f7c6e5ba..9cd7c5a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -477,19 +477,10 @@ dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
 AC_CHECK_HEADERS( \
-	assert.h \
-	fcntl.h \
-	stdarg.h \
-	stdlib.h \
-	string.h \
-	unistd.h \
 	sys/byteorder.h \
 	sys/ioctl.h \
-	sys/select.h \
 	sys/sockio.h \
 	sys/strredir.h \
-	sys/time.h \
-	time.h \
 	stdint.h \
 	wchar.h \
 	cwchar \
@@ -846,17 +837,8 @@ fi dnl
 AC_SUBST($1)])
 
 RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
 
 AC_CONFIG_FILES([Makefile \
 doc/Makefile \
diff --git a/src/background.C b/src/background.C
index ff093fd7..77cc4bcc 100644
--- a/src/background.C
+++ b/src/background.C
@@ -27,6 +27,7 @@
 #define DO_TIMING_TEST 0
 
 #if DO_TIMING_TEST
+# include <sys/time.h>
 #define TIMING_TEST_START(id) \
 	struct timeval timing_test_##id##_stv;\
   gettimeofday (&timing_test_##id##_stv, NULL);
diff --git a/src/init.C b/src/init.C
index 94c00a37..39e2bd4c 100644
--- a/src/init.C
+++ b/src/init.C
@@ -43,6 +43,8 @@
 
 #include <csignal>
 
+#include <fcntl.h>
+
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index 120299fd..5af947ca 100644
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -4,18 +4,14 @@
 #include <cstdio>
 #include <cctype>
 #include <cerrno>
-@include_stdarg_h@
-@include_stdlib_h@
+#include <cstdarg>
+#include <cstdlib>
 @include_stdint_h@
 #include <sys/types.h>
-@include_unistd_h@
-@include_string_h@
-@include_fcntl_h@
-@include_assert_h@
+#include <unistd.h>
+#include <cstring>
+#include <assert.h>
 @include_sys_ioctl_h@
-@include_sys_time_h@
-@include_time_h@
-@include_sys_select_h@
 @include_sys_strredir_h@
 
 #include <sys/wait.h>