From: John Carr <jfc@mit.edu>
Date: Wed, 31 Oct 1990 14:46:32 +0000 (+0000)
Subject: <time.h> vs. <sys/time.h> macros
X-Git-Tag: krb5-1.0-alpha2~29
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1e0e0db662ab2b0787a754175e9d97ac7f9cbb05;p=krb5.git

<time.h> vs. <sys/time.h> macros

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1382 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index fceb22a90..e0de46a58 100644
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -198,6 +198,23 @@ P_STDLIBH=-DHasStdlibHTrue
 #else
 P_STDLIBH=-UHasStdlibHTrue
 #endif
+/* Override system defaults for <time.h> vs <sys/time.h> */
+#if !defined(UseTimeH) && !defined(UseSysTimeH)
+#ifdef OS_BSD
+#define	UseSysTimeH
+#else
+#define	UseTimeH
+#endif
+#endif
+#ifdef UseTimeH
+#ifdef UseSysTimeH
+P_TIME_DEFS=-DUseTimeH -DUseSysTimeH
+#else
+P_TIME_DEFS=-DUseTimeH -UUseSysTimeH
+#endif
+#else
+P_TIME_DEFS=-DUseSysTimeH -UUseTimeH
+#endif
 
 /*
  * Default Definitions.
@@ -215,7 +232,7 @@ P_STDLIBH=-UHasStdlibHTrue
              POSY = PosyCmd
             TOUCH = TouchCmd
              PERL = PerlCmd
-  PROCESS_DEFINES = $(P_TERMIOS) $(P_FLOCKS) $(P_TYPES) $(P_SIGTYPE) $(P_STRINGH) $(P_BITSIZE) $(P_DBM) $(P_INET) $(P_STDLIBH) -DUnifdefRan
+  PROCESS_DEFINES = $(P_TERMIOS) $(P_FLOCKS) $(P_TYPES) $(P_SIGTYPE) $(P_STRINGH) $(P_BITSIZE) $(P_DBM) $(P_INET) $(P_STDLIBH) $(P_TIME_DEFS) -DUnifdefRan
        DESDEFINES = DesDefines
             ETSRC = $(TOP)/comerr
             SSSRC = $(TOP)/ss