httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@lnd.com>
Subject [Patch] Build 2.0 cleanups (very short)
Date Fri, 07 Apr 2000 14:29:33 GMT
Not too long so I tossed these inline, here are the incomplete thoughts to
cleanup from recent patches.  Mostly missing declaration emits, but a few
like ap_file_t -> ap_finfo_t bugs and a leftover ap_slack declaration as
well.

Bill

Index: apache-2.0/src/lib/apr/aprlib.def
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.17
diff -u -r1.17 aprlib.def
--- aprlib.def	2000/04/07 02:16:55	1.17
+++ aprlib.def	2000/04/07 14:24:14
@@ -241,3 +241,5 @@
         ap_dso_unload @220
         ap_dso_sym @221
         ap_dso_init @222
+	ap_month_snames @223
+	ap_day_snames @224
Index: apache-2.0/src/lib/apr/file_io/win32/filestat.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
retrieving revision 1.12
diff -u -r1.12 filestat.c
--- filestat.c	2000/04/05 03:55:57	1.12
+++ filestat.c	2000/04/07 14:24:16
@@ -117,9 +117,9 @@
         finfo->group = info.st_gid;
         finfo->size = info.st_size;
         finfo->inode = info.st_ino;
-        ap_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
-        ap_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
-        ap_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
+        finfo->atime = info.st_atime;
+        finfo->mtime = info.st_mtime;
+        finfo->ctime = info.st_ctime;
         return APR_SUCCESS;
     }
     else {
Index: apache-2.0/src/lib/apr/include/apr_lib.h
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/include/apr_lib.h,v
retrieving revision 1.24
diff -u -r1.24 apr_lib.h
--- apr_lib.h	2000/04/03 18:37:07	1.24
+++ apr_lib.h	2000/04/07 14:24:18
@@ -132,7 +132,6 @@
                                     char *arg_str, char ***argv_out);
 API_EXPORT(const char *) ap_filename_of_pathname(const char *pathname);
 /*API_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/
-API_EXPORT(int) ap_slack(int l, int h);
 API_EXPORT_NONSTD(ap_status_t) ap_execle(const char *c, const char *a,
...);
 API_EXPORT_NONSTD(ap_status_t) ap_execve(const char *c, const char *argv[],
 				  const char *envp[]);
Index: apache-2.0/src/include/http_config.h
===================================================================
RCS file: /cvs/apache/apache-2.0/src/include/http_config.h,v
retrieving revision 1.11
diff -u -r1.11 http_config.h
--- http_config.h	2000/03/31 07:18:56	1.11
+++ http_config.h	2000/04/07 14:24:12
@@ -341,6 +341,7 @@
 void ap_child_init_hook(ap_context_t *pchild, server_rec *s);
 void ap_register_hooks(module *m);
 void ap_hook_deregister_all(void);
+void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t
*ptemp);
-
 /* For http_request.c... */

 void *ap_create_request_config(ap_context_t *p);Index:
apache-2.0/src/lib/apr/lib/apr_pools.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.41
diff -u -r1.41 apr_pools.c
--- apr_pools.c	2000/04/03 19:44:44	1.41
+++ apr_pools.c	2000/04/07 14:24:25
@@ -65,6 +65,7 @@
 #include "apr_pools.h"
 #include "apr_lib.h"
 #include "apr_lock.h"
+#include "apr_portable.h"
 #include "misc.h"

 #ifdef HAVE_SYS_STAT_H
@@ -166,9 +167,6 @@
 #define BLOCK_MINFREE	0
 #define BLOCK_MINALLOC	0
 #endif /* ALLOC_USE_MALLOC */
-
-#define AP_SLACK_LOW    1
-#define AP_SLACK_HIGH   2


 /*****************************************************************
Index: apache-2.0/src/lib/apr/misc/win32/start.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.19
diff -u -r1.19 start.c
--- start.c	2000/04/07 03:07:50	1.19
+++ start.c	2000/04/07 14:24:26
@@ -60,6 +60,7 @@
 #include "apr_lib.h"
 #include <string.h>
 #include <process.h>
+#include <stdlib.h>

 ap_status_t clean_cont(void *data)
 {
Index: apache-2.0/src/modules/standard/mod_speling.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/standard/mod_speling.c,v
retrieving revision 1.11
diff -u -r1.11 mod_speling.c
--- mod_speling.c	2000/03/31 09:05:18	1.11
+++ mod_speling.c	2000/04/07 14:25:05
@@ -64,6 +64,7 @@
 #include "http_request.h"
 #include "http_log.h"
 #include "apr_file_io.h"
+#include <stdlib.h>

 /* mod_speling.c - by Alexei Kosut <akosut@organic.com> June, 1996
  *
Index: apache-2.0/src/modules/standard/mod_usertrack.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.12
diff -u -r1.12 mod_usertrack.c
--- mod_usertrack.c	2000/03/31 09:05:19	1.12
+++ mod_usertrack.c	2000/04/07 14:25:07
@@ -104,6 +104,7 @@
 #include "http_config.h"
 #include "http_core.h"
 #include "http_request.h"
+#include <stdlib.h>

 module MODULE_VAR_EXPORT usertrack_module;



Mime
View raw message