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...@hyperreal.org on 1999/05/10 17:29:41 UTC
cvs commit: apache-apr/apr/threadproc/unix Makefile proc.c
rbb 99/05/10 08:29:41
Modified: apr/lib Makefile.in
apr/threadproc/unix Makefile proc.c
Log:
Second part of the big commit to change from apr_ to ap_. I think this fixes
the rest of the problems.
Revision Changes Path
1.6 +1 -1 apache-apr/apr/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1999/04/28 19:20:15 1.5
+++ Makefile.in 1999/05/10 15:29:39 1.6
@@ -9,7 +9,7 @@
LDLIBS=@LDLIBS@
LDFLAGS=@LDFLAGS@ $(LDLIBS)
INCDIR=../include
-INCLUDES=-I$(INCDIR)
+INCLUDES=-I../../include -I$(INCDIR)
LIB=libapr.a
1.3 +1 -1 apache-apr/apr/threadproc/unix/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 1999/05/10 14:36:35 1.2
+++ Makefile 1999/05/10 15:29:40 1.3
@@ -47,7 +47,7 @@
LIB= libthreadproc.a
-OBJS= proc.o thread.o threadcancel.o threadpriv.o
+OBJS= proc.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
1.8 +1 -1 apache-apr/apr/threadproc/unix/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proc.c 1999/05/10 14:36:36 1.7
+++ proc.c 1999/05/10 15:29:40 1.8
@@ -183,7 +183,7 @@
while (args[i]) {
i++;
}
- newargs = (char **)apr_palloc(cont->pool, sizeof (char *) * (i + 3));
+ newargs = (char **)ap_palloc(cont->pool, sizeof (char *) * (i + 3));
newargs[0] = strdup(SHELL_PATH);
newargs[1] = strdup("-c");
i = 0;