We don't actually use anything in atime.h, so get rid of it, and include

all of the headers in the .c files.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60149 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 25 insertions, 85 deletions

diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in
index fcab84a77..cdfe91da1 100644
--- a/time/unix/Makefile.in
+++ b/time/unix/Makefile.in
@@ -49,13 +49,13 @@ depend:
 	    && 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 \
diff --git a/time/unix/atime.h b/time/unix/atime.h
deleted file mode 100644
index f22167486..000000000
--- a/time/unix/atime.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-#ifndef ATIME_H
-#define ATIME_H
-
-#include "apr_private.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 */
-
-struct atime_t {
-    ap_pool_t *cntxt;
-    struct timeval *currtime;
-    struct tm *explodedtime;
-    int time_ex;    /* have we already exploded the time? */
-};
-    
-
-#endif  /* ! ATIME_H */
-
diff --git a/time/unix/time.c b/time/unix/time.c
index bbd0dd312..20344ac47 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -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)
 {
diff --git a/time/unix/timestr.c b/time/unix/timestr.c
index aa65f534f..9b9cb9b4a 100644
--- a/time/unix/timestr.c
+++ b/time/unix/timestr.c
@@ -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] =
 {