This change gets APR compiling on BeOS again. Some filename changes

to accomodate having multiple common.c files.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59513 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 541 insertions, 34 deletions

diff --git a/file_io/beos/Makefile.in b/file_io/beos/Makefile.in
new file mode 100644
index 000000000..07ffd80bb
--- /dev/null
+++ b/file_io/beos/Makefile.in
@@ -0,0 +1,64 @@
+#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+#LIBS=$(EXTRA_LIBS) $(LIBS1)
+#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
+
+RM=@RM@
+CC=@CC@
+RANLIB=@RANLIB@
+CFLAGS=@CFLAGS@ @OPTIM@
+LIBS=@LIBS@
+LDFLAGS=@LDFLAGS@ $(LIBS)
+INCDIR=../../inc
+INCDIR1=../../include -I../unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+
+LIB=libfile.a
+
+OBJS=file_io_common.o 	readwrite.o
+
+.c.o:
+	$(CC) $(CFLAGS) -c $(INCLUDES) $<
+
+all: $(LIB)
+
+clean:
+	$(RM) -f *.o *.a *.so
+
+distclean: clean
+	-$(RM) -f Makefile
+
+$(OBJS): Makefile
+
+$(LIB): $(OBJS)
+	$(RM) -f $@
+	$(AR) cr $@ $(OBJS)
+	$(RANLIB) $@
+
+#
+# We really don't expect end users to use this rule.  It works only with
+# gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
+# using it.
+#
+depend:
+	cp Makefile.in Makefile.in.bak \
+	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
+	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
+	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
+		> Makefile.in \
+	    && rm Makefile.new
+
+# DO NOT REMOVE
+file_io_common.o: file_io_common.c ../unix/dir.c ../unix/fileio.h \
+ ../../include/apr_config.h ../../include/apr_general.h \
+ ../../include/apr.h ../../include/apr_errno.h \
+ ../../include/apr_file_io.h ../../include/apr_lib.h \
+ ../../include/apr_portable.h ../../include/apr_thread_proc.h \
+ ../../include/apr_network_io.h ../../include/apr_lock.h \
+ ../../include/apr_time.h ../unix/fileacc.c ../unix/filedup.c \
+ ../unix/filestat.c ../unix/open.c ../unix/pipe.c ../unix/seek.c
+readwrite.o: readwrite.c ../unix/fileio.h ../../include/apr_config.h \
+ ../../include/apr_general.h ../../include/apr.h \
+ ../../include/apr_errno.h ../../include/apr_file_io.h \
+ ../../include/apr_lib.h
diff --git a/file_io/beos/file_io_common.c b/file_io/beos/file_io_common.c
new file mode 100644
index 000000000..e553378a8
--- /dev/null
+++ b/file_io/beos/file_io_common.c
@@ -0,0 +1,74 @@
+/* ====================================================================
+ * 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
+ *    apache@apache.org.
+ *
+ * 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"
diff --git a/file_io/beos/readwrite.c b/file_io/beos/readwrite.c
new file mode 100644
index 000000000..fb8241eee
--- /dev/null
+++ b/file_io/beos/readwrite.c
@@ -0,0 +1,367 @@
+/* ====================================================================
+ * 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
+ *    apache@apache.org.
+ *
+ * 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/>.
+ *
+ */
+
+#include "../unix/fileio.h"
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *)
+ *    Read data from the specified file.
+ * arg 1) The file descriptor to read from.
+ * arg 2) The buffer to store the data to.
+ * arg 3) The number of bytes to read.
+ * NOTE:  ap_read will read up to the specified number of bytes, but never
+ * more.  If there isn't enough data to fill that number of bytes, all of
+ * the available data is read.  The third argument is modified to reflect the
+ * number of bytes read. 
+ */
+ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
+{
+    ap_ssize_t rv;
+
+    if (thefile->filedes < 0) {
+        *nbytes = -1;
+        return APR_EBADF;
+    }
+    
+    if (thefile->buffered) {
+        rv = fread(buf, *nbytes, 1, thefile->filehand);
+    }
+    else {
+        rv = read(thefile->filedes, buf, *nbytes);
+    }
+
+    if ((*nbytes != rv) && (errno != EINTR) && !thefile->buffered) {
+        thefile->eof_hit = 1;
+    }
+    *nbytes = rv;
+    if (rv == -1) {
+        return errno;
+    }
+    return APR_SUCCESS;
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *)
+ *    Write data to the specified file.
+ * arg 1) The file descriptor to write to.
+ * arg 2) The buffer which contains the data.
+ * arg 3) The number of bytes to write.
+ * NOTE:  ap_write will write up to the specified number of bytes, but never
+ * more.  If the OS cannot write that many bytes, it will write as many as it
+ * can.  The third argument is modified to reflect the * number of bytes 
+ * written. 
+ */
+ap_status_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
+{
+    ap_size_t rv;
+
+    if (thefile->filedes < 0) {
+        *nbytes = -1;
+        return APR_EBADF;
+    }
+
+    if (thefile->buffered) {
+        rv = fwrite(buf, *nbytes, 1, thefile->filehand);
+    }
+    else {
+        rv = write(thefile->filedes, buf, *nbytes);
+    }
+
+    thefile->stated = 0;
+    *nbytes = rv;
+    if (rv == -1) {
+        return errno;
+    }
+    return APR_SUCCESS;
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_writev(ap_file_t *, ap_iovec_t *, ap_ssize_t *)
+ *    Write data from ap_iovec array to the specified file.
+ * arg 1) The file descriptor to write to.
+ * arg 2) The array from which to get the data to write to the file.
+ * arg 3) The number of elements in the ap_iovec array.  This must be
+ *        smaller than AP_MAX_IOVEC_SIZE.  If it isn't, the function will
+ *        fail with APR_EINVAL.
+ * NOTE:  The third arguement is updated with the number of bytes actually 
+ *        written on function exit. 
+ */
+#ifdef HAVE_WRITEV
+
+ap_status_t ap_make_iov(struct iovec_t **new, struct iovec *iova, ap_context_t *cntxt)
+{
+    (*new) = ap_palloc(cntxt, sizeof(struct iovec_t));
+    if ((*new) == NULL) {
+        return APR_ENOMEM;
+    }
+    (*new)->cntxt = cntxt;
+    (*new)->theiov = iova;
+    return APR_SUCCESS;
+}
+
+ap_status_t ap_writev(struct file_t *thefile, const struct iovec_t *vec, ap_ssize_t *iocnt)
+{
+    int bytes;
+    if ((bytes = writev(thefile->filedes, vec->theiov, *iocnt)) < 0) {
+        *iocnt = bytes;
+        return errno;
+    }
+    else {
+        *iocnt = bytes;
+        thefile->stated = 0;
+        return APR_SUCCESS;
+    }
+}
+#endif
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_putc(char, ap_file_t *)
+ *    put a character into the specified file.
+ * arg 1) The file descriptor to write to
+ * arg 2) The character to write.
+ */
+ap_status_t ap_putc(char ch, ap_file_t *thefile)
+{
+    if (thefile->buffered) {
+        if (fputc(ch, thefile->filehand) == ch) {
+            thefile->stated = 0;
+            return APR_SUCCESS;
+        }
+        return errno;
+    }
+    if (write(thefile->filedes, &ch, 1) != 1) {
+        return errno;
+    }
+    thefile->stated = 0;
+    return APR_SUCCESS; 
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_ungetc(char, ap_file_t *)
+ *    put a character back onto a specified stream.
+ * arg 1) The file descriptor to write to
+ * arg 2) The character to write.
+ */
+ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
+{
+    if (thefile->buffered) {
+        if (ungetc(ch, thefile->filehand) == ch) {
+            thefile->stated = 0;
+            return APR_SUCCESS;
+        }
+        return errno;
+    }
+    /* Not sure what to do in this case.  For now, return SUCCESS. */
+    thefile->stated = 0;
+    return APR_SUCCESS; 
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_getc(char *, ap_file_t *)
+ *    get a character from the specified file.
+ * arg 1) The file descriptor to write to
+ * arg 2) The character to write.
+ */
+ap_status_t ap_getc(char *ch, ap_file_t *thefile)
+{
+    ssize_t rv;
+    
+    if (thefile->buffered) {
+        int r;
+
+	r=fgetc(thefile->filehand);
+	if(r != EOF)
+	    {
+	    *ch=(char)r;
+	    return APR_SUCCESS;
+	    }
+        if (feof(thefile->filehand)) {
+            return APR_EOF;
+        }
+        return errno;
+    }
+    rv = read(thefile->filedes, ch, 1); 
+    if (rv == 0) {
+        thefile->eof_hit = TRUE;
+        return APR_EOF;
+    }
+    else if (rv != 1) {
+        return errno;
+    }
+    return APR_SUCCESS; 
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_puts(char *, ap_file_t *)
+ *    Put the string into a specified file.
+ * arg 1) The file descriptor to write to from
+ * arg 2) The string to write. 
+ */
+ap_status_t ap_puts(char *str, ap_file_t *thefile)
+{
+    ssize_t rv;
+    int len;
+
+    if (thefile->buffered) {
+        if (fputs(str, thefile->filehand)) {
+            thefile->stated = 0;
+            return APR_SUCCESS;
+        }
+        return errno;
+    }
+    len = strlen(str);
+    rv = write(thefile->filedes, str, len); 
+    if (rv != len) {
+        return errno;
+    }
+    thefile->stated = 0;
+    return APR_SUCCESS; 
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_flush(ap_file_t *)
+ *    Flush the file's buffer.
+ * arg 1) The file descriptor to flush
+ */
+ap_status_t ap_flush(ap_file_t *thefile)
+{
+    if (thefile->buffered) {
+        if (!fflush(thefile->filehand)) {
+            thefile->stated = 0;
+            return APR_SUCCESS;
+        }
+        return errno;
+    }
+    /* There isn't anything to do if we aren't buffering the output
+     * so just return success.
+     */
+    return APR_SUCCESS; 
+}
+
+/* ***APRDOC********************************************************
+ * ap_status_t ap_fgets(char *, int, ap_file_t *)
+ *    Get a string from a specified file.
+ * arg 1) The file descriptor to read from
+ * arg 2) The buffer to store the string in. 
+ * arg 3) The length of the string
+ */
+ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
+{
+    ssize_t rv;
+    int i;    
+
+    if (thefile->buffered) {
+        if (fgets(str, len, thefile->filehand)) {
+            return APR_SUCCESS;
+        }
+        if (feof(thefile->filehand)) {
+            return APR_EOF;
+        }
+        return errno;
+    }
+    for (i = 0; i < len; i++) {
+        rv = read(thefile->filedes, &str[i], 1); 
+        if (rv == 0) {
+            thefile->eof_hit = TRUE;
+            return APR_EOF;
+        }
+        else if (rv != 1) {
+            return errno;
+        }
+        if (str[i] == '\n' || str[i] == '\r')
+            break;
+    }
+    return APR_SUCCESS; 
+}
+
+#if 0 /* not currently used */
+static int printf_flush(ap_vformatter_buff_t *vbuff)
+{
+    /* I would love to print this stuff out to the file, but I will
+     * get that working later.  :)  For now, just return.
+     */
+    return -1;
+}
+#endif
+
+API_EXPORT(int) ap_fprintf(struct file_t *fptr, const char *format, ...)
+{
+    int cc;
+    va_list ap;
+    ap_vformatter_buff_t vbuff;
+    char *buf;
+    ap_ssize_t len;
+
+    buf = malloc(HUGE_STRING_LEN);
+    if (buf == NULL) {
+        return 0;
+    }
+    /* save one byte for nul terminator */
+    vbuff.curpos = buf;
+    vbuff.endpos = buf + len - 1;
+    va_start(ap, format);
+#if 0
+    cc = ap_vformatter(printf_flush, &vbuff, format, ap);
+    va_end(ap);
+    *vbuff.curpos = '\0';
+#endif
+    vsprintf(buf, format, ap);
+    len = strlen(buf);
+    cc = ap_write(fptr, buf, &len);
+    va_end(ap);
+    return (cc == -1) ? len : cc;
+}
+
+
diff --git a/misc/beos/Makefile.in b/misc/beos/Makefile.in
index 3e6ef795f..e1a40cf3e 100644
--- a/misc/beos/Makefile.in
+++ b/misc/beos/Makefile.in
@@ -50,10 +50,13 @@ depend:
 	    && 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
diff --git a/misc/beos/getopt.c b/misc/beos/getopt.c
index b3c1c47b4..d0af733af 100644
--- a/misc/beos/getopt.c
+++ b/misc/beos/getopt.c
@@ -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 */
diff --git a/misc/beos/misc.h b/misc/beos/misc.h
index 299df2c5a..6f253afe4 100644
--- a/misc/beos/misc.h
+++ b/misc/beos/misc.h
@@ -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;
diff --git a/misc/beos/start.c b/misc/beos/start.c
index f6ca03b73..25a478211 100644
--- a/misc/beos/start.c
+++ b/misc/beos/start.c
@@ -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_status_t ap_create_context(struct context_t **newcont, struct context_t *cont
     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();;
diff --git a/mmap/beos/Makefile.in b/mmap/beos/Makefile.in
index b66162601..5aaf9cd24 100644
--- a/mmap/beos/Makefile.in
+++ b/mmap/beos/Makefile.in
@@ -15,7 +15,7 @@ INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
 
 LIB=libmmap.a
 
-OBJS=mmap.o common.o
+OBJS=mmap.o mmap_common.o
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
@@ -50,18 +50,16 @@ depend:
 	    && 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
diff --git a/mmap/beos/common.c b/mmap/beos/mmap_common.c
index 7742d0f9a..7742d0f9a 100644
--- a/mmap/beos/common.c
+++ b/mmap/beos/mmap_common.c