Sync with HEAD

[openldap] / include / ac / time.h

diff --git a/include/ac/time.h b/include/ac/time.h
index 0742a5ce60c0797799193982f9c4f56acd7a2cef..da0bb58040e75fdfd3bddc54937ea1428e31fa3f 100644 (file)
--- a/include/ac/time.h
+++ b/include/ac/time.h
@@ -1,4 +1,18 @@
 /* Generic time.h */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 
 #ifndef _AC_TIME_H
 #define _AC_TIME_H
@@ -6,13 +20,13 @@
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
-#else
-  /* Do not use #elif, not all non-ANSI compilers support it. */
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
+#elif HAVE_SYS_TIME_H
+# include <sys/time.h>
+# ifdef HAVE_SYS_TIMEB_H
+#  include <sys/timeb.h>
 # endif
+#else
+# include <time.h>
 #endif
 
 #endif /* _AC_TIME_H */