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...@locus.apache.org on 2000/11/09 07:40:17 UTC

cvs commit: apache-2.0/src/lib/apr/tables Makefile.in apr_tables.c

rbb         00/11/08 22:40:17

  Modified:    src/lib/apr/tables Makefile.in apr_tables.c
  Log:
  Cleanup the tables Makefiles.
  
  Revision  Changes    Path
  1.2       +2 -3      apache-2.0/src/lib/apr/tables/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/07/24 23:28:08	1.1
  +++ Makefile.in	2000/11/09 06:40:17	1.2
  @@ -11,8 +11,7 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../include
  -INCDIR1=../misc/@OSDIR@
  -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I../misc/unix
  +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
   
   OBJS=apr_tables.o \
   	apr_hash.o 
  @@ -58,4 +57,4 @@
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
  - ../misc/unix/misc.h $(INCDIR)/apr_getopt.h
  + $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr_getopt.h
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/tables/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_tables.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_tables.c	2000/10/16 06:04:49	1.6
  +++ apr_tables.c	2000/11/09 06:40:17	1.7
  @@ -66,7 +66,7 @@
   #include "apr_tables.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
  -#include "misc.h"
  +#include "unix/misc.h"
   #ifdef HAVE_STDLIB_H
   #include <stdlib.h>
   #endif
  
  
  

Re: cvs commit: apache-2.0/src/lib/apr/tables Makefile.in apr_tables.c

Posted by rb...@covalent.net.
On Wed, 8 Nov 2000, Greg Stein wrote:

> On Thu, Nov 09, 2000 at 06:40:17AM -0000, rbb@locus.apache.org wrote:
> >...
> >   --- apr_tables.c	2000/10/16 06:04:49	1.6
> >   +++ apr_tables.c	2000/11/09 06:40:17	1.7
> >   @@ -66,7 +66,7 @@
> >    #include "apr_tables.h"
> >    #include "apr_strings.h"
> >    #include "apr_lib.h"
> >   -#include "misc.h"
> >   +#include "unix/misc.h"
> >    #ifdef HAVE_STDLIB_H
> >    #include <stdlib.h>
> >    #endif
> 
> Euh... isn't apr_tables.c platform independent? Why does it include
> unix/misc.h?
> 
> And if does, then what is in there? Shouldn't it be moved to a platform-
> independent include file?

I really don't know why it was there.  I had written it down to come back
to it after I was done and the server was working again.  Since you sent
mail about it before I got back to it on my own I just looked at it.  I
have removed that line without any ill side-effects.  I will commit the
rest of the fixups ASAP.

Ryan

_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------


Re: cvs commit: apache-2.0/src/lib/apr/tables Makefile.in apr_tables.c

Posted by Greg Stein <gs...@lyra.org>.
On Thu, Nov 09, 2000 at 06:40:17AM -0000, rbb@locus.apache.org wrote:
>...
>   --- apr_tables.c	2000/10/16 06:04:49	1.6
>   +++ apr_tables.c	2000/11/09 06:40:17	1.7
>   @@ -66,7 +66,7 @@
>    #include "apr_tables.h"
>    #include "apr_strings.h"
>    #include "apr_lib.h"
>   -#include "misc.h"
>   +#include "unix/misc.h"
>    #ifdef HAVE_STDLIB_H
>    #include <stdlib.h>
>    #endif

Euh... isn't apr_tables.c platform independent? Why does it include
unix/misc.h?

And if does, then what is in there? Shouldn't it be moved to a platform-
independent include file?

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/