Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 21916 invoked by uid 6000); 13 Oct 1999 09:38:12 -0000
Received: (qmail 21910 invoked by uid 2016); 13 Oct 1999 09:38:11 -0000
Delivered-To: apcore-apache-2.0-cvs@apache.org
Received: (qmail 21908 invoked by uid 240); 13 Oct 1999 09:38:10 -0000
Date: 13 Oct 1999 09:38:10 -0000
Message-ID: <19991013093810.21907.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/file_io/os2 Makefile.in fileio.h
 filestat.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         99/10/13 02:38:09

  Modified:    src/lib/apr/file_io/os2 Makefile.in fileio.h filestat.c
  Log:
  OS/2: Some cleaning up for file_io.
  
  Revision  Changes    Path
  1.4       +10 -15    apache-2.0/src/lib/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	1999/08/28 08:57:10	1.3
  +++ Makefile.in	1999/10/13 09:38:07	1.4
  @@ -60,36 +60,31 @@
   # DO NOT REMOVE
   dir.o: dir.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   fileacc.o: fileacc.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   filedup.o: filedup.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   filestat.o: filestat.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   maperrorcode.o: maperrorcode.c $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr_config.h \
    $(INCDIR1)/apr_errno.h
   open.o: open.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
    $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_portable.h $(INCDIR1)/apr_thread_proc.h \
  + $(INCDIR1)/apr_win.h $(INCDIR1)/apr_network_io.h \
  + $(INCDIR1)/apr_lock.h $(INCDIR1)/apr_time.h
   pipe.o: pipe.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   readwrite.o: readwrite.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
   seek.o: seek.c fileio.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/hsregex.h
  + $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_lib.h
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fileio.h	1999/08/17 15:59:36	1.1
  +++ fileio.h	1999/10/13 09:38:08	1.2
  @@ -65,7 +65,7 @@
   
   struct file_t {
       ap_context_t *cntxt;
  -    ULONG filedes;
  +    HFILE filedes;
       char * fname;
       int isopen;
       int buffered;
  
  
  
  1.2       +0 -12     apache-2.0/src/lib/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filestat.c	1999/08/17 15:59:36	1.1
  +++ filestat.c	1999/10/13 09:38:08	1.2
  @@ -62,18 +62,6 @@
   #include <os2.h>
   
   
  -typedef struct {
  -  USHORT sec2:5;
  -  USHORT min:6;
  -  USHORT hour:5;
  -} DOSTIME;
  -
  -typedef struct {
  -  USHORT day:5;
  -  USHORT month:4;
  -  USHORT year:7;
  -} DOSDATE;
  -
   long os2date2unix( FDATE os2date, FTIME os2time )
   {
     struct tm tmpdate;