Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 13 Apr 2000 18:49:30 -0000
Message-ID: <20000413184930.55873.qmail@locus.apache.org>
From: stoddard@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/misc/win32 start.c

stoddard    00/04/13 11:49:30

  Modified:    src/lib/apr/include apr_config.hw
               src/lib/apr/misc/win32 start.c
  Log:
  Win32: A few more tweaks to the late binding code as suggested by Greg Stein
  
  Revision  Changes    Path
  1.7       +1 -1      apache-2.0/src/lib/apr/include/apr_config.hw
  
  Index: apr_config.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.hw,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_config.hw	2000/04/13 14:59:46	1.6
  +++ apr_config.hw	2000/04/13 18:49:29	1.7
  @@ -179,7 +179,7 @@
   
   #define DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
       typedef rettype (calltype *fpt##fn) args; \
  -    static fpt##fn pfn##fn; \
  +    static fpt##fn pfn##fn = NULL; \
       __inline rettype Late##fn args \
       {   if (!pfn##fn) \
               pfn##fn = (fpt##fn) LoadLateDllFunc(lib, #fn, ord); \
  
  
  
  1.22      +1 -1      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- start.c	2000/04/13 15:30:09	1.21
  +++ start.c	2000/04/13 18:49:29	1.22
  @@ -233,7 +233,7 @@
    * missing from one or more releases of the Win32 API
    */
   
  -static char *lateDllName[DLL_defined] = {
  +static const char* const lateDllName[DLL_defined] = {
       "kernel32", "advapi32", "mswsock",  "ws2_32"  };
   static HMODULE lateDllHandle[DLL_defined] = {
       NULL,       NULL,       NULL,       NULL      };