dreid 99/12/12 09:08:48
Modified: src/lib/apr/misc/beos Makefile.in getopt.c misc.h start.c src/lib/apr/mmap/beos Makefile.in Added: src/lib/apr/file_io/beos Makefile.in file_io_common.c readwrite.c src/lib/apr/mmap/beos mmap_common.c Removed: src/lib/apr/mmap/beos common.c Log: This change gets APR compiling on BeOS again. Some filename changes to accomodate having multiple common.c files. Revision Changes Path 1.7 +13 -55 apache-2.0/src/lib/apr/file_io/beos/Makefile.in 1.1 apache-2.0/src/lib/apr/file_io/beos/file_io_common.c Index: file_io_common.c =================================================================== /* ==================================================================== * Copyright (c) 1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group. * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ /* common.c */ /* The code used in readwrite.c in the Unix directory won't work on BeOS so I've moved to using a common.c file for all the common code. */ #include "../unix/dir.c" #include "../unix/fileacc.c" #include "../unix/filedup.c" #include "../unix/filestat.c" #include "../unix/open.c" #include "../unix/pipe.c" #include "../unix/seek.c" 1.5 +187 -36 apache-2.0/src/lib/apr/file_io/beos/readwrite.c 1.5 +10 -7 apache-2.0/src/lib/apr/misc/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.in 1999/11/02 11:30:37 1.4 +++ Makefile.in 1999/12/12 17:08:44 1.5 @@ -50,10 +50,13 @@ && rm Makefile.new # DO NOT REMOVE -getopt.o: getopt.c misc.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h -start.o: start.c ../../include/apr_config.h \ - ../../include/apr_general.h ../../include/apr_errno.h \ - $(INCDIR)/apr_pools.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h misc.h +getopt.o: getopt.c misc.h ../../include/apr_config.h \ + ../../include/apr_general.h ../../include/apr.h \ + ../../include/apr_errno.h ../../include/apr_pools.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h \ + ../../include/apr_getopt.h +start.o: start.c misc.h ../../include/apr_config.h \ + ../../include/apr_general.h ../../include/apr.h \ + ../../include/apr_errno.h ../../include/apr_pools.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h \ + ../../include/apr_getopt.h 1.3 +0 -3 apache-2.0/src/lib/apr/misc/beos/getopt.c Index: getopt.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/getopt.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- getopt.c 1999/11/22 14:52:13 1.2 +++ getopt.c 1999/12/12 17:08:44 1.3 @@ -31,9 +31,6 @@ * SUCH DAMAGE. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "misc.h" int ap_opterr = 1, /* if error message should be printed */ 1.6 +14 -2 apache-2.0/src/lib/apr/misc/beos/misc.h Index: misc.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- misc.h 1999/12/07 15:09:20 1.5 +++ misc.h 1999/12/12 17:08:45 1.6 @@ -56,10 +56,22 @@ #ifndef MISC_H #define MISC_H +#include "apr_config.h" #include "apr_general.h" -#include "apr_file_io.h" -#include "apr_errno.h" +#include "apr_pools.h" #include "apr_getopt.h" +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H +#include <stdio.h> +#endif +#ifdef HAVE_STRING_H +#include <string.h> +#endif +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif typedef struct datastruct { void *data; 1.9 +1 -9 apache-2.0/src/lib/apr/misc/beos/start.c Index: start.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- start.c 1999/11/05 21:26:19 1.8 +++ start.c 1999/12/12 17:08:45 1.9 @@ -53,15 +53,7 @@ * */ -#include <stdio.h> -#include <dirent.h> -#include "apr_config.h" -#include "apr_general.h" -#include "apr_errno.h" -#include "apr_pools.h" #include "misc.h" -#include <errno.h> -#include <string.h> ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont) { @@ -69,7 +61,7 @@ ap_pool_t *pool; if (cont) { - pool = ap_make_sub_pool(cont->pool); + pool = ap_make_sub_pool(cont->pool, cont->apr_abort); } else { pool = ap_init_alloc();; 1.4 +11 -13 apache-2.0/src/lib/apr/mmap/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 1999/11/03 12:30:55 1.3 +++ Makefile.in 1999/12/12 17:08:47 1.4 @@ -15,7 +15,7 @@ LIB=libmmap.a -OBJS=mmap.o common.o +OBJS=mmap.o mmap_common.o .c.o: $(CC) $(CFLAGS) -c $(INCLUDES) $< @@ -50,18 +50,16 @@ && rm Makefile.new # DO NOT REMOVE -common.o: common.c ../unix/common.c ../unix/../beos/mmap_h.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_mmap.h \ - ../../include/apr_network_io.h ../../include/apr_portable.h \ - ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ - ../../include/apr_win.h ../../include/apr_lock.h \ - ../../include/apr_time.h ../../file_io/unix/fileio.h \ - ../../include/apr_lib.h mmap.o: mmap.c mmap_h.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ + ../../include/apr.h ../../include/apr_errno.h \ ../../include/apr_mmap.h ../../include/apr_network_io.h \ + ../../include/apr_file_io.h ../../include/apr_portable.h \ + ../../include/apr_thread_proc.h ../../include/apr_lock.h \ + ../../include/apr_time.h ../../include/apr_lib.h \ + ../../file_io/unix/fileio.h ../../include/apr_config.h +mmap_common.o: mmap_common.c ../unix/common.c ../unix/../beos/mmap_h.h \ + ../../include/apr_general.h ../../include/apr.h \ + ../../include/apr_errno.h ../../include/apr_mmap.h \ + ../../include/apr_network_io.h ../../include/apr_file_io.h \ ../../include/apr_portable.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_win.h \ - ../../include/apr_lock.h ../../include/apr_time.h \ - ../../include/apr_lib.h ../../file_io/unix/fileio.h + ../../include/apr_lock.h ../../include/apr_time.h 1.1 apache-2.0/src/lib/apr/mmap/beos/mmap_common.c Index: mmap_common.c =================================================================== #include "../unix/common.c"