rbb         99/12/14 16:40:25

  Modified:    src/lib/apr/file_io/win32 file_io.def
               src/lib/apr/include apr_win.h
               src/lib/apr/misc/win32 misc.def
  Log:
  Fix some build issues with APR on Windows.  I am still getting some warnings,
  but at least Apache itself will almost build again.
  
  Revision  Changes    Path
  1.6       +9 -8      apache-2.0/src/lib/apr/file_io/win32/file_io.def
  
  Index: file_io.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/file_io.def,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- file_io.def       1999/10/05 01:16:19     1.5
  +++ file_io.def       1999/12/15 00:40:11     1.6
  @@ -29,17 +29,18 @@
        ap_read   @22
        ap_write   @23
        ap_seek   @24
  -     ap_get_filedata   @25
  -     ap_set_filedata   @26
  -     ap_get_os_file   @27
  +    ap_get_filedata   @25
  +    ap_set_filedata   @26
  +    ap_get_os_file   @27
        ap_put_os_file @28
  -     ap_get_os_dir   @29
  -     ap_putc   @30
  -     ap_getc   @31
  +    ap_get_os_dir   @29
  +    ap_putc   @30
  +    ap_getc   @31
        ap_puts @32
        ap_fgets @33
        ap_flush @34
  -     ap_fprintf   @35
  -     ap_eof   @36
  +    ap_fprintf   @35
  +    ap_eof   @36
        ap_get_filetype @37
        ap_writev @38
  +    ap_open_stderr   @39
  \ No newline at end of file
  
  
  
  1.8       +0 -2      apache-2.0/src/lib/apr/include/apr_win.h
  
  Index: apr_win.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_win.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_win.h 1999/12/09 21:00:25     1.7
  +++ apr_win.h 1999/12/15 00:40:15     1.8
  @@ -127,8 +127,6 @@
   #define API_EXPORT_NONSTD(type)  type
   #define API_VAR_IMPORT           extern _declspec(dllimport)
   
  -
  -
   /* struct iovec is needed to emulate Unix writev */
   struct iovec {
       char* iov_base;
  
  
  
  1.3       +8 -8      apache-2.0/src/lib/apr/misc/win32/misc.def
  
  Index: misc.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.def,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- misc.def  1999/09/22 14:00:07     1.2
  +++ misc.def  1999/12/15 00:40:19     1.3
  @@ -11,12 +11,12 @@
        ap_destroy_context   @6
        WinTimeToUnixTime   @7
        ap_get_oslevel   @8
  -     ap_get_userdata   @9
  -     ap_set_userdata   @10
  -     ap_initialize   @11
  +    ap_get_userdata   @9
  +    ap_set_userdata   @10
  +    ap_initialize   @11
        ap_getopt    @12
  -     opterr   @13 DATA
  -     optind   @14 DATA
  -     optopt   @15 DATA
  -     optreset   @16 DATA
  -     optarg   @17 DATA
  +     ap_opterr   @13 DATA
  +     ap_optind   @14 DATA
  +     ap_optopt   @15 DATA
  +     ap_optreset   @16 DATA
  +     ap_optarg   @17 DATA
  
  
  

Reply via email to