Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 16656 invoked by uid 6000); 5 Mar 1998 10:45:26 -0000
Received: (qmail 16650 invoked by alias); 5 Mar 1998 10:45:25 -0000
Delivered-To: apache-1.3-cvs@hyperreal.org
Received: (qmail 16648 invoked by uid 168); 5 Mar 1998 10:45:25 -0000
Message-ID: <19980305104525.16647.qmail@hyperreal.org>
Subject: cvs commit: apache-1.3/src/modules/standard mod_rewrite.h
To: apache-1.3-cvs@hyperreal.org
Date: Thu, 5 Mar 1998 02:45:25 -0800 (PST)
From: rse@apache.org (Ralf S. Engelschall)
Organization: The Apache Group
X-Mailer: ELM [version 2.4ME+ PL37 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

rse         98/03/05 02:45:25

  Modified:    src/include conf.h
               src/modules/standard mod_rewrite.h
  Log:
  Situation:
     The function getpwnam() is used in
        main/util.c
        main/util_script.c
        modules/standard/mod_userdir.c
        modules/standard/mod_rewrite.c
     but only for mod_rewrite.c the file
        os/win32/passwd.h
     was included. All others were compiled without the prototype.
     Under Unix this is no problem, because there we have <pwd.h>
     which is already included in conf.h.
  
  Solution:
     put the special stuff which was added to mod_rewrite.h into conf.h
     where it belongs to, so it is generally used by all modules.
  
  (The <netinet/in.h> is also removed from mod_rewrite.h because
   already included in conf.h)
  
  Revision  Changes    Path
  1.187     +11 -2     apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- conf.h	1998/03/03 01:22:10	1.186
  +++ conf.h	1998/03/05 10:45:23	1.187
  @@ -836,7 +836,6 @@
   #include <arpa/inet.h>		/* for inet_ntoa */
   #endif
   #include <sys/wait.h>
  -#include <pwd.h>
   #include <grp.h>
   #include <fcntl.h>
   #include <limits.h>
  @@ -850,7 +849,17 @@
   #include <malloc.h>
   #include <io.h>
   #include <fcntl.h>
  -#endif /* ndef WIN32 */
  +#endif /* WIN32 */
  +
  +/* 
  + * Under Unix we have <pwd.h> for getpwnam() and friends,
  + * under WIN32 this is emulated by our os/win32/passwd.h
  + */
  +#ifdef WIN32
  +#include "../os/win32/passwd.h"
  +#else
  +#include <pwd.h>
  +#endif
   
   #include <time.h>		/* for ctime */
   #include <signal.h>
  
  
  
  1.46      +0 -5      apache-1.3/src/modules/standard/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mod_rewrite.h	1998/03/05 10:21:25	1.45
  +++ mod_rewrite.h	1998/03/05 10:45:24	1.46
  @@ -99,11 +99,6 @@
   #include <ctype.h>
   #include <sys/types.h>
   #include <sys/stat.h>
  -#ifdef WIN32
  -#include "../../os/win32/passwd.h"
  -#else
  -#include <netinet/in.h>
  -#endif
   
       /* Include from the Apache server ... */
   #include "httpd.h"