httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/file_io/unix fileacc.c
Date Thu, 02 Nov 2000 17:38:29 GMT
wrowe       00/11/02 09:38:26

  Modified:    src/lib/apr/file_io/unix fileacc.c
  Log:
    Restore backwards compatibility for WIN32/!APR_HAS_UNICODE_FS, now all
    should play happily together.
  
  Revision  Changes    Path
  1.37      +6 -3      apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- fileacc.c	2000/11/02 16:13:41	1.36
  +++ fileacc.c	2000/11/02 17:38:22	1.37
  @@ -76,7 +76,8 @@
   
   apr_status_t apr_get_filename(char **fname, apr_file_t *thefile)
   {
  -#if defined(WIN32) && APR_HAS_UNICODE_FS
  +#ifdef WIN32 /* this test is only good until some other platform trys wchar* */
  +#if APR_HAS_UNICODE_FS
       apr_oslevel_e os_level;
       if (!apr_get_oslevel(thefile->cntxt, &os_level) && os_level >= APR_WIN_NT)
       {
  @@ -91,10 +92,12 @@
               return APR_ENAMETOOLONG;
       }
       else
  +#else /* !APR_HAS_UNICODE_FS */
           *fname = apr_pstrdup(thefile->cntxt, thefile->n.fname);
  -#else
  -        *fname = apr_pstrdup(thefile->cntxt, thefile->fname);
   #endif
  +#else /* !def Win32 */
  +        *fname = apr_pstrdup(thefile->cntxt, thefile->fname);
  +#endif 
       return APR_SUCCESS;
   }
   
  
  
  

Mime
View raw message