Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 8640 invoked by uid 6000); 6 Sep 1999 03:23:49 -0000
Received: (qmail 8467 invoked by uid 2016); 6 Sep 1999 03:23:45 -0000
Delivered-To: apcore-apache-2.0-cvs@apache.org
Received: (qmail 8423 invoked by uid 216); 6 Sep 1999 03:23:45 -0000
Date: 6 Sep 1999 03:23:45 -0000
Message-ID: <19990906032345.8422.qmail@hyperreal.org>
From: manoj@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/inc apr_pools.h
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

manoj       99/09/05 20:23:44

  Modified:    src/include ap_config.h
               src/lib/apr/inc apr_pools.h
  Log:
  The closesocket define causes problems on BeOS. Get rid of it where
  appropriate.
  
  Submitted by:	In part by David Reid <abb37@dial.pipex.com>
  
  Revision  Changes    Path
  1.7       +0 -1      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -u -r1.6 -r1.7
  --- ap_config.h	1999/08/31 05:32:16	1.6
  +++ ap_config.h	1999/09/06 03:23:39	1.7
  @@ -1068,7 +1068,6 @@
   #include <pwd.h>
   #include <grp.h>
   #include <fcntl.h>
  -#define closesocket(s) close(s)
   #ifndef O_BINARY
   #define O_BINARY (0)
   #endif
  
  
  
  1.4       +4 -0      apache-2.0/src/lib/apr/inc/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/inc/apr_pools.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -u -r1.3 -r1.4
  --- apr_pools.h	1999/08/31 05:32:31	1.3
  +++ apr_pools.h	1999/09/06 03:23:44	1.4
  @@ -232,7 +232,11 @@
   #define ap_fdopen(d,m) fdopen((d), (m))
   #endif
   
  +/* XXX - the socket functions for pools should (and will) use APR sockets.
  + * This is temporary. */
  +#ifndef BEOS /* this really screws up BeOS R4.5 !! */
   #define closesocket(s) close(s)
  +#endif