'RE: Two APR 2.0 cleanup patches'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-httpd-dev
Subject:    RE: Two APR 2.0 cleanup patches
From:       "William A. Rowe, Jr." <wrowe () lnd ! com>
Date:       2000-03-31 2:02:14
[Download RAW message or body]

> 1) lib/apr/lib/apr_slack.c is unreferenced, was never portable anyway.
>    off to the attic with it.
> 
>    One reference to ap_slack and 2 defines to eliminate,
>    (AP_SLACK_HIGH/AP_SLACK_LOW) in noslack.diffs
> 
>    This is my first hack at a makefile.in - please confirm I'm right.

and I'm so worried about makefile.in being correct...
forgot the win32 .def of this fix:

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.14
diff -u -r1.14 aprlib.def
--- aprlib.def	2000/03/28 22:59:02	1.14
+++ aprlib.def	2000/03/31 01:07:00
@@ -216,7 +216,7 @@
 	ap_cleanup_for_exec   @195
 	ap_null_cleanup   @196
 	ap_note_subprocess   @197
-	ap_slack   @198
+;	ap_slack   @198
 	ap_vformatter   @199
 	ap_snprintf   @200
 	ap_vsnprintf   @201
["noslack.diffs" (application/octet-stream)]

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.22
diff -u -r1.22 apr_lib.h
--- apr_lib.h	2000/03/10 00:06:09	1.22
+++ apr_lib.h	2000/03/30 22:08:26
@@ -141,7 +141,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/lib/apr/lib/apr_pools.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.37
diff -u -r1.37 apr_pools.c
--- apr_pools.c	2000/03/29 01:33:34	1.37
+++ apr_pools.c	2000/03/30 23:40:45
@@ -173,9 +173,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/lib/Makefile.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- Makefile.in	2000/03/18 12:32:17	1.10
+++ Makefile.in	2000/03/31 00:16:31
@@ -22,7 +22,6 @@
 	apr_md5.o \
 	apr_pools.o \
 	apr_signal.o \
-	apr_slack.o \
 	apr_snprintf.o \
 	apr_tables.o \
 	apr_getpass.o
@@ -86,10 +85,6 @@
 apr_signal.o: apr_signal.c $(INCDIR)/apr_config.h \
  $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_thread_proc.h
-apr_slack.o: apr_slack.c $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  $(INCDIR)/apr_thread_proc.h
 apr_snprintf.o: apr_snprintf.c $(INCDIR)/apr_config.h \
  $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
Index: apache-2.0/src/lib/apr/aprlib.dsp
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/aprlib.dsp,v
retrieving revision 1.9
diff -u -r1.9 aprlib.dsp
--- aprlib.dsp	2000/03/28 21:22:17	1.9
+++ aprlib.dsp	2000/03/31 00:16:20
@@ -121,11 +121,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_slack.c
-# ADD CPP /I "./misc/win32/" /I "./file_io/win32/"
-# End Source File
-# Begin Source File
-
 SOURCE=.\lib\apr_snprintf.c
 # End Source File
 # Begin Source File
Index: apache-2.0/src/lib/apr/aprlib.mak
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/aprlib.mak,v
retrieving revision 1.9
diff -u -r1.9 aprlib.mak
--- aprlib.mak	2000/03/28 21:22:18	1.9
+++ aprlib.mak	2000/03/31 00:16:21
@@ -55,7 +55,6 @@
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_md5.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_slack.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\dir.obj"
@@ -117,7 +116,6 @@
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\apr_slack.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\dir.obj" \
@@ -177,7 +175,6 @@
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_md5.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_slack.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\dir.obj"
@@ -243,7 +240,6 @@
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\apr_slack.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\dir.obj" \
@@ -551,54 +547,6 @@
 
 "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\lib\apr_slack.c
-
-!IF  "$(CFG)" == "aprlib - Win32 Release"
-
-DEP_CPP_APR_S=\
-	".\include\apr_errno.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_win.h"\
-	".\include\apr_winconfig.h"\
-	
-CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
- "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
- "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_APR_S=\
-	".\include\apr_errno.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_win.h"\
-	".\include\apr_winconfig.h"\
-	
-CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
- "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
- "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
 
 
 !ENDIF 


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic