httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr.hw apr_config.hw
Date Tue, 04 Apr 2000 21:31:06 GMT
stoddard    00/04/04 14:31:06

  Modified:    src/lib/apr/file_io/win32 open.c
               src/lib/apr/include apr.hw apr_config.hw
  Log:
  Windows specific ap_oslevel modifications.
  Move ap_oslevel_e out of ap_config.hw (private to APR) and into apr.hw (public)
  and allow finer grained OS level checking.
  
  Submitted by:	Bill Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.28      +1 -1      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- open.c	2000/04/03 19:44:36	1.27
  +++ open.c	2000/04/04 21:31:04	1.28
  @@ -107,7 +107,7 @@
       (*dafile)->demonfname = canonical_filename((*dafile)->cntxt, fname);
       (*dafile)->lowerdemonfname = strlwr((*dafile)->demonfname);
    
  -    if (ap_get_oslevel(cont, &level) == APR_SUCCESS && level == APR_WIN_NT)
{
  +    if (ap_get_oslevel(cont, &level) == APR_SUCCESS && level >= APR_WIN_NT)
{
           sharemode |= FILE_SHARE_DELETE;
       }
   
  
  
  
  1.2       +10 -0     apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr.hw	2000/04/03 18:40:39	1.1
  +++ apr.hw	2000/04/04 21:31:05	1.2
  @@ -137,6 +137,16 @@
   #define API_VAR_IMPORT           extern _declspec(dllimport)
   #define API_VAR_EXPORT
   
  +/* Platform specific designation of run time os version.
  + * Gaps allow for specific service pack levels that 
  + * export new kernel or winsock functions or behavior.
  + */
  +typedef enum {
  +	APR_WIN_95 = 0, 
  +	APR_WIN_98 = 4, 
  +	APR_WIN_NT = 8
  +} ap_oslevel_e;
  +
   /* struct iovec is needed to emulate Unix writev */
   struct iovec {
       char* iov_base;
  
  
  
  1.3       +0 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_config.hw	2000/04/04 20:33:47	1.2
  +++ apr_config.hw	2000/04/04 21:31:05	1.3
  @@ -89,8 +89,6 @@
   #define HAVE_LIMITS_H 1
   #define HAVE_SIGNAL_H 1
   
  -typedef enum {APR_WIN_NT, APR_WIN_95, APR_WIN_98} ap_oslevel_e;
  -
   #define SIGHUP     1
   /* 2 is used for SIGINT on windows */
   #define SIGQUIT    3
  
  
  

Mime
View raw message