httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/unix Makefile.in poll.c sendrecv.c
Date Thu, 09 Nov 2000 07:13:42 GMT
rbb         00/11/08 23:13:42

  Modified:    .        STATUS
               src/lib/apr/mmap/unix Makefile.in
               src/lib/apr/network_io/unix Makefile.in poll.c sendrecv.c
  Log:
  Tie up some loose ends that fell through the cracks while I was fixing
  things the first time.  The server compiles again after this change.
  
  Revision  Changes    Path
  1.154     +1 -8      apache-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- STATUS	2000/11/09 00:36:39	1.153
  +++ STATUS	2000/11/09 07:13:42	1.154
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 2000/11/09 00:36:39 $]
  +Last modified at [$Date: 2000/11/09 07:13:42 $]
   
   Release:
   
  @@ -175,13 +175,6 @@
       * make apr_get_uuid() thread-safe
   
       * (possibly) use UUIDs in mod_unique_id and/or mod_usertrack
  -
  -    * Platforms which have their own APR directories for some feature but
  -      mostly use the unix directories (e.g., OS/390 which uses an os390
  -      directory only for the DSO feature) don't compile cleanly because the
  -      include path is messed up.  For example, start.c can't find locks.h.
  -      See new-httpd thread "os-specific directories and -Ifoo/OSDIR in APR"
  -      in August/2000.
   
   PRs that have been suspended forever waiting for someone to
   put them into 'the next release':
  
  
  
  1.15      +3 -4      apache-2.0/src/lib/apr/mmap/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in	2000/07/07 19:14:53	1.14
  +++ Makefile.in	2000/11/09 07:13:42	1.15
  @@ -10,8 +10,7 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCDIR1=../../file_io/@OSDIR@
  -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
  +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
   
   LIB=libmmap.a
   
  @@ -61,5 +60,5 @@
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h
  + $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h
  
  
  
  1.18      +3 -3      apache-2.0/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Makefile.in	2000/07/23 17:24:51	1.17
  +++ Makefile.in	2000/11/09 07:13:42	1.18
  @@ -10,7 +10,7 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I.
  +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
   
   LIB=libnetwork.a
   
  @@ -59,14 +59,14 @@
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - ../../file_io/unix/fileio.h
  + $(INCDIR)/arch/unix/fileio.h
   sendrecv.o: sendrecv.c networkio.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - ../../file_io/unix/fileio.h
  + $(INCDIR)/arch/unix/fileio.h
   sockaddr.o: sockaddr.c networkio.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  
  
  
  1.39      +1 -1      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- poll.c	2000/08/06 06:07:22	1.38
  +++ poll.c	2000/11/09 07:13:42	1.39
  @@ -53,7 +53,7 @@
    */
   
   #include "networkio.h"
  -#include "../../file_io/unix/fileio.h"
  +#include "unix/fileio.h"
   
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
  
  
  
  1.46      +1 -1      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- sendrecv.c	2000/11/07 20:21:45	1.45
  +++ sendrecv.c	2000/11/09 07:13:42	1.46
  @@ -56,7 +56,7 @@
   
   #if APR_HAS_SENDFILE
   /* This file is needed to allow us access to the apr_file_t internals. */
  -#include "../../file_io/unix/fileio.h"
  +#include "unix/fileio.h"
   
   /* Glibc2.1.1 fails to define TCP_CORK.  This is a bug that will be 
    *fixed in the next release.  It should be 3
  
  
  

Mime
View raw message