You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Rodent of Unusual Size <Ke...@Golux.Com> on 1997/12/24 01:52:04 UTC
[PATCH] Move ap_snprintf() from main to ap
Okey, here's a patch to move the main/util_snprintf.c file over
to ap/ap_snprintf.c. It works on UNIX, but the project files
for NT will need appropriate changes.
#ken P-)}
Index: main/Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/main/Makefile.tmpl,v
retrieving revision 1.6
diff -u -r1.6 Makefile.tmpl
--- Makefile.tmpl 1997/10/07 19:53:25 1.6
+++ Makefile.tmpl 1997/12/24 00:47:25
@@ -10,7 +10,7 @@
OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o\
- md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o \
+ md5c.o util_md5.o explain.o http_bprintf.o util_date.o \
fnmatch.o http_vhost.o
.c.o:
@@ -144,4 +144,3 @@
util_script.o: util_script.c httpd.h conf.h alloc.h buff.h \
http_config.h http_conf_globals.h http_main.h http_log.h \
http_protocol.h http_core.h http_request.h util_script.h
-util_snprintf.o: util_snprintf.c conf.h
Index: ap/Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v
retrieving revision 1.3
diff -u -r1.3 Makefile.tmpl
--- Makefile.tmpl 1997/12/19 14:30:13 1.3
+++ Makefile.tmpl 1997/12/24 00:47:49
@@ -6,7 +6,7 @@
LIB=libap.a
-OBJS=ap_signal.o ap_slack.o
+OBJS=ap_signal.o ap_slack.o ap_snprintf.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
@@ -26,3 +26,4 @@
# dependencies
ap_signal.o: $(INCDIR)/httpd.h
ap_slack.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h
+ap_snprintf.o: $(INCDIR)/conf.h
Re: [PATCH] Move ap_snprintf() from main to ap
Posted by Dean Gaudet <dg...@arctic.org>.
+1... when you move it I'd prefer it if you actually make a copy of the
RCS file in the CVS repository. Then cvs rm the old copy. That maintains
history nicely.
Dean
On Tue, 23 Dec 1997, Rodent of Unusual Size wrote:
> Okey, here's a patch to move the main/util_snprintf.c file over
> to ap/ap_snprintf.c. It works on UNIX, but the project files
> for NT will need appropriate changes.
>
> #ken P-)}
>
> Index: main/Makefile.tmpl
> ===================================================================
> RCS file: /export/home/cvs/apachen/src/main/Makefile.tmpl,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile.tmpl
> --- Makefile.tmpl 1997/10/07 19:53:25 1.6
> +++ Makefile.tmpl 1997/12/24 00:47:25
> @@ -10,7 +10,7 @@
>
> OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
> http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o\
> - md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o \
> + md5c.o util_md5.o explain.o http_bprintf.o util_date.o \
> fnmatch.o http_vhost.o
>
> .c.o:
> @@ -144,4 +144,3 @@
> util_script.o: util_script.c httpd.h conf.h alloc.h buff.h \
> http_config.h http_conf_globals.h http_main.h http_log.h \
> http_protocol.h http_core.h http_request.h util_script.h
> -util_snprintf.o: util_snprintf.c conf.h
> Index: ap/Makefile.tmpl
> ===================================================================
> RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile.tmpl
> --- Makefile.tmpl 1997/12/19 14:30:13 1.3
> +++ Makefile.tmpl 1997/12/24 00:47:49
> @@ -6,7 +6,7 @@
>
> LIB=libap.a
>
> -OBJS=ap_signal.o ap_slack.o
> +OBJS=ap_signal.o ap_slack.o ap_snprintf.o
>
> .c.o:
> $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
> @@ -26,3 +26,4 @@
> # dependencies
> ap_signal.o: $(INCDIR)/httpd.h
> ap_slack.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h
> +ap_snprintf.o: $(INCDIR)/conf.h
>