Use TIME_WITH_SYS_TIME

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1601 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/roken/getdtablesize.c

@@ -44,8 +44,17 @@ RCSID("$Id$");
 #include "roken.h"
 
 #include <sys/types.h>
+#ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
+#include <time.h>
+#elif defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <unistd.h>
 
 #ifdef HAVE_SYS_RESOURCE_H

lib/roken/roken.h

@@ -204,13 +204,11 @@ int rcmd(char **ahost, unsigned short inport, const char *locuser,
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
+#elif defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
 #else
 #include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
+#endif
 
 time_t tm2time (struct tm tm, int local);
 

lib/roken/roken.h.in

@@ -204,13 +204,11 @@ int rcmd(char **ahost, unsigned short inport, const char *locuser,
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
+#elif defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
 #else
 #include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
+#endif
 
 time_t tm2time (struct tm tm, int local);
 

lib/roken/strftime.c

@@ -38,13 +38,11 @@
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
+#elif defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
 #else
 #include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
+#endif
 #define TM_YEAR_BASE	1900	/* from <tzfile.h> */
 #include <string.h>
 

lib/roken/tm2time.c

@@ -41,9 +41,13 @@
 RCSID("$Id$");
 #endif
 
-#include <time.h>
-#ifdef HAVE_SYS_TIME_H
+#ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
+#include <time.h>
+#elif defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#else
+#include <time.h>
 #endif
 #include "roken.h"