You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@hyperreal.org on 1999/10/10 19:25:32 UTC
cvs commit: apache-2.0/src/lib/apr/threadproc/beos apr_proc_stub.c
dreid 99/10/10 10:25:32
Modified: src/lib/apr configure.in
src/lib/apr/network_io/beos sockopt.c
src/lib/apr/threadproc/beos apr_proc_stub.c
Log:
Fixing a couple of small bugs in the beos code.
Adjust the way that the check for OSDIR is done. As beos used to have
a file_io and a time dircetory they still show up in the CVS tarballs and
so the check was failing. Thinking about it it's better to look for the
Makefile.in in a directory anyway so thats what this patch does. With it
everything still works.
Revision Changes Path
1.17 +1 -1 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 1999/10/10 17:07:57 1.16
+++ configure.in 1999/10/10 17:25:29 1.17
@@ -223,7 +223,7 @@
SUBDIRS="lib "
for dir in $MODULES
do
- if test -d $dir/$OSDIR; then
+ if test -f $dir/$OSDIR/Makefile.in; then
MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
SUBDIRS="$SUBDIRS $dir/$OSDIR "
else
1.6 +2 -2 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sockopt.c 1999/10/10 13:54:18 1.5
+++ sockopt.c 1999/10/10 17:25:30 1.6
@@ -108,7 +108,7 @@
hptr = gethostbyaddr((char *)&(sock->addr->sin_addr),
sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
- name = (char**)ap_pstrdup(sock->cntxt, hptr->h_name);
+ *name = (char*)ap_pstrdup(sock->cntxt, hptr->h_name);
if (*name) {
return APR_SUCCESS;
}
@@ -116,6 +116,6 @@
}
/* XXX - Is this threadsafe? - manoj */
- /* on BeOS this is a global... */
+ /* on BeOS h_errno is a global... */
return h_errno;
}
1.2 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c
Index: apr_proc_stub.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_proc_stub.c 1999/09/10 14:00:46 1.1
+++ apr_proc_stub.c 1999/10/10 17:25:31 1.2
@@ -32,7 +32,7 @@
size_t readbuf = 100;
readbuffer = (char*)malloc(sizeof(char) * readbuf);
- newargs = (char**)malloc(sizeof(char) * (argc - 1));
+ *newargs = (char*)malloc(sizeof(char) * (argc - 1));
buffer = (void*)malloc(sizeof(struct pipefd));
/* this will block until we get the data */