You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/06/08 00:32:55 UTC
cvs commit: apache-2.0/src/lib/apr/time/unix Makefile.in time.c timestr.c atime.h
rbb 00/06/07 15:32:53
Modified: src/lib/apr/time/unix Makefile.in time.c timestr.c
Removed: src/lib/apr/time/unix atime.h
Log:
We don't actually use anything in atime.h, so get rid of it, and include
all of the headers in the .c files.
Revision Changes Path
1.15 +2 -2 apache-2.0/src/lib/apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 2000/04/30 17:58:34 1.14
+++ Makefile.in 2000/06/07 22:32:50 1.15
@@ -49,13 +49,13 @@
&& rm Makefile.new
# DO NOT REMOVE
-time.o: time.c atime.h $(INCDIR)/apr_private.h \
+time.o: time.c $(INCDIR)/apr_private.h \
$(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
$(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
$(INCDIR)/apr_file_io.h $(INCDIR)/apr_thread_proc.h \
$(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
$(INCDIR)/apr_lock.h
-timestr.o: timestr.c atime.h $(INCDIR)/apr_private.h \
+timestr.o: timestr.c $(INCDIR)/apr_private.h \
$(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
$(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
$(INCDIR)/apr_file_io.h $(INCDIR)/apr_thread_proc.h \
1.25 +11 -1 apache-2.0/src/lib/apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- time.c 2000/04/14 15:58:53 1.24
+++ time.c 2000/06/07 22:32:51 1.25
@@ -52,8 +52,18 @@
* <http://www.apache.org/>.
*/
-#include "atime.h"
#include "apr_portable.h"
+#include "apr_time.h"
+#include "apr_lib.h"
+/* System Headers required for time library */
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_TIME_H
+#include <time.h>
+#endif
+/* End System Headers */
+
ap_status_t ap_ansi_time_to_ap_time(ap_time_t *result, time_t input)
{
1.15 +12 -2 apache-2.0/src/lib/apr/time/unix/timestr.c
Index: timestr.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- timestr.c 2000/05/28 02:47:09 1.14
+++ timestr.c 2000/06/07 22:32:51 1.15
@@ -52,10 +52,20 @@
* <http://www.apache.org/>.
*/
-#include "atime.h"
#include "apr_portable.h"
-
+#include "apr_time.h"
+#include "apr_lib.h"
+/* System Headers required for time library */
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_TIME_H
+#include <time.h>
+#endif
+#if HAVE_STRING_H
#include <string.h>
+#endif
+/* End System Headers */
APR_VAR_EXPORT const char ap_month_snames[12][4] =
{