X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=modules%2Ftime;h=46a85ec5034efd9043ed3ad7a191d01e7923f942;hb=6a9b156fdf9c71c0bbc8bb0b3aa0262df5674dda;hp=b69ed57807d4da9f5730210a0d7ca2e854ff8f60;hpb=89861a8be877136ea47794016b00a5a095c30ea4;p=pspp

diff --git a/modules/time b/modules/time
index b69ed57807..46a85ec503 100644
--- a/modules/time
+++ b/modules/time
@@ -2,12 +2,13 @@ Description:
 A more-standard <time.h>.
 
 Files:
-lib/time_.h
+lib/time.in.h
 m4/time_h.m4
 
 Depends-on:
 extensions
 include_next
+stddef
 
 configure.ac:
 gl_HEADER_TIME_H
@@ -17,24 +18,26 @@ BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time_.h
-	rm -f $@-t $@
+time.h: time.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
 	      -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+	      -e 's|@REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
 	      -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
 	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
 	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
-	      < $(srcdir)/time_.h; \
-	} > $@-t
+	      < $(srcdir)/time.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
 
 Include:
-#include <time.h>
+<time.h>
 
 License:
 LGPLv2+