apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: cvs commit: apr/time/unix time.c
Date Sun, 28 Jan 2001 15:39:23 GMT
Sorry, here's what changed without win32 cruft tossed in...

> wrowe       01/01/28 07:30:32
> 
>   Modified:    .        apr.dsp apr.mak libapr.dsp libapr.mak
>                dso/os2  dso.c
>                file_io/os2 dir.c filedup.c filestat.c maperrorcode.c
>                         readwrite.c seek.c
>                include  apr.h.in apr_errno.h apr_portable.h
>                include/arch/os2 dso.h fileio.h locks.h os2calls.h
>                locks/os2 locks.c
>                misc/unix errorcodes.c
>                network_io/os2 os2calls.c poll.c
>                shmem/os2 shmem.c
>                test     aprtest.dsp
>                threadproc/os2 proc.c signals.c thread.c
>                time/unix time.c
>   Removed:     include/arch/os2 os2nerrno.h
>                network_io/os2 os2calls.h os2nerrno.h
>   Log:
>     OS2 was chasing os2errno.h which we hid in a private platform directory,
>     but apr_errno.h is public.  It also called in <os.h> with possibly
>     inappropriate headers, and if os2.h follows any other header's usual
>     conventions, calling it the second time for more declarations can be
>     dicey.  Relocated <os2.h> into apr.h.in (accessable to all, since it's
>     later leveraged by most), which simplifies a bunch of code, and relocate
>     all of the os2errno values into apr_errno.h for APR_STATUS_IS_FOO tests.



>   Index: dso.c
>   ===================================================================
>   RCS file: /home/cvs/apr/dso/os2/dso.c,v
>   retrieving revision 1.18
>   retrieving revision 1.19
>   diff -u -r1.18 -r1.19
>   --- dso.c 2001/01/19 09:56:31 1.18
>   +++ dso.c 2001/01/28 15:30:23 1.19
>   @@ -54,8 +54,6 @@
>    
>    #include "dso.h"
>    #include "apr_strings.h"
>   -#define INCL_DOS
>   -#include <os2.h>
>    #include <stdio.h>
>    #include <string.h>
>    
>   
>   
>   
>   1.24      +0 -3      apr/file_io/os2/dir.c
>   
>   Index: dir.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/dir.c,v
>   retrieving revision 1.23
>   retrieving revision 1.24
>   diff -u -r1.23 -r1.24
>   --- dir.c 2001/01/25 11:34:53 1.23
>   +++ dir.c 2001/01/28 15:30:23 1.24
>   @@ -58,9 +58,6 @@
>    #include "apr_strings.h"
>    #include <string.h>
>    
>   -#define INCL_DOS
>   -#include <os2.h>
>   -
>    static apr_status_t dir_cleanup(void *thedir)
>    {
>        apr_dir_t *dir = thedir;
>   
>   
>   
>   1.19      +0 -3      apr/file_io/os2/filedup.c
>   
>   Index: filedup.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/filedup.c,v
>   retrieving revision 1.18
>   retrieving revision 1.19
>   diff -u -r1.18 -r1.19
>   --- filedup.c 2000/11/14 06:40:03 1.18
>   +++ filedup.c 2001/01/28 15:30:23 1.19
>   @@ -58,9 +58,6 @@
>    #include "apr_strings.h"
>    #include <string.h>
>    
>   -#define INCL_DOS
>   -#include <os2.h>
>   -
>    apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
>    {
>        int rv;
>   
>   
>   
>   1.19      +0 -1      apr/file_io/os2/filestat.c
>   
>   Index: filestat.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/filestat.c,v
>   retrieving revision 1.18
>   retrieving revision 1.19
>   diff -u -r1.18 -r1.19
>   --- filestat.c 2001/01/25 11:34:55 1.18
>   +++ filestat.c 2001/01/28 15:30:23 1.19
>   @@ -58,7 +58,6 @@
>    #include "apr_file_io.h"
>    #include "apr_lib.h"
>    #include <sys/time.h>
>   -#include <os2.h>
>    
>    
>    static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
>   
>   
>   
>   1.12      +1 -3      apr/file_io/os2/maperrorcode.c
>   
>   Index: maperrorcode.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/maperrorcode.c,v
>   retrieving revision 1.11
>   retrieving revision 1.12
>   diff -u -r1.11 -r1.12
>   --- maperrorcode.c 2000/11/14 06:40:03 1.11
>   +++ maperrorcode.c 2001/01/28 15:30:24 1.12
>   @@ -57,9 +57,7 @@
>    #include "apr_file_io.h"
>    #include <errno.h>
>    #include <string.h>
>   -#include <os2.h>
>   -#include "../../network_io/os2/os2calls.h"
>   -
>   +#include "apr_errno.h"
>    
>    static int errormap[][2] = {
>        { NO_ERROR,                   APR_SUCCESS      },
>   
>   
>   
>   1.37      +0 -1      apr/file_io/os2/readwrite.c
>   
>   Index: readwrite.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
>   retrieving revision 1.36
>   retrieving revision 1.37
>   diff -u -r1.36 -r1.37
>   --- readwrite.c 2000/11/14 06:40:03 1.36
>   +++ readwrite.c 2001/01/28 15:30:24 1.37
>   @@ -59,7 +59,6 @@
>    #include "apr_file_io.h"
>    #include "apr_lib.h"
>    
>   -#include <os2.h>
>    #include <malloc.h>
>    
>    apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
>   
>   
>   
>   1.13      +0 -4      apr/file_io/os2/seek.c
>   
>   Index: seek.c
>   ===================================================================
>   RCS file: /home/cvs/apr/file_io/os2/seek.c,v
>   retrieving revision 1.12
>   retrieving revision 1.13
>   diff -u -r1.12 -r1.13
>   --- seek.c 2001/01/20 21:39:02 1.12
>   +++ seek.c 2001/01/28 15:30:24 1.13
>   @@ -58,10 +58,6 @@
>    #include <string.h>
>    #include <io.h>
>    
>   -#define INCL_DOS
>   -#include <os2.h>
>   -
>   -
>    
>    static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
>    {
>   
>   
>   
>   1.64      +6 -0      apr/include/apr.h.in
>   
>   Index: apr.h.in
>   ===================================================================
>   RCS file: /home/cvs/apr/include/apr.h.in,v
>   retrieving revision 1.63
>   retrieving revision 1.64
>   diff -u -r1.63 -r1.64
>   --- apr.h.in 2001/01/27 22:25:10 1.63
>   +++ apr.h.in 2001/01/28 15:30:25 1.64
>   @@ -243,4 +243,10 @@
>    #endif /* !WEXITSTATUS */
>    #endif /* HAVE_SYS_WAIT_H */
>    
>   +#ifdef OS2
>   +#define INCL_DOS
>   +#define INCL_DOSERRORS
>   +#include <os2.h>
>   +#endif
>   +
>    #endif /* APR_H */
>   
>   
>   
>   1.53      +48 -2     apr/include/apr_errno.h
>   
>   Index: apr_errno.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/apr_errno.h,v
>   retrieving revision 1.52
>   retrieving revision 1.53
>   diff -u -r1.52 -r1.53
>   --- apr_errno.h 2001/01/24 09:44:49 1.52
>   +++ apr_errno.h 2001/01/28 15:30:25 1.53
>   @@ -457,14 +457,60 @@
>    
>    #define INCL_DOSERRORS
>    #define INCL_DOS
>   -#include <os2.h>
>   -#include "../network_io/os2/os2nerrno.h"
>    /* And this needs to be greped away for good:
>     */
>    #define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
>    
>    #define APR_STATUS_IS_SUCCESS(s)           ((s) == APR_SUCCESS \
>                    || (s) == APR_OS_START_SYSERR + NO_ERROR)
>   +
>   +/* These can't sit in a private header, so in spite of the extra size, 
>   + * they need to be made available here.
>   + */
>   +#define SOCBASEERR              10000
>   +#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
>   +#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
>   +#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call
*/
>   +#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address
*/
>   +#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
>   +#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
>   +#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
>   +#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
>   +#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files
*/
>   +#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
>   +#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
>   +#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block
*/
>   +#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress
*/
>   +#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in
progress */
>   +#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on
non-socket */
>   +#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address
required */
>   +#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
>   +#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type
for socket */
>   +#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available
*/
>   +#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported
*/
>   +#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported
*/
>   +#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported
on socket */
>   +#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not
supported */
>   +#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported
by protocol family */
>   +#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use
*/
>   +#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested
address */
>   +#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
>   +#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable
*/
>   +#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection
on reset */
>   +#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection
abort */
>   +#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by
peer */
>   +#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available
*/
>   +#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected
*/
>   +#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected
*/
>   +#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket
shutdown */
>   +#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references:
can't splice */
>   +#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out
*/
>   +#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
>   +#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic
links */
>   +#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
>   +#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
>   +#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
>   +#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty
*/
>    
>    /* APR CANONICAL ERROR TESTS */
>    #define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES \
>   
>   
>   
>   1.43      +0 -2      apr/include/apr_portable.h
>   
>   Index: apr_portable.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/apr_portable.h,v
>   retrieving revision 1.42
>   retrieving revision 1.43
>   diff -u -r1.42 -r1.43
>   --- apr_portable.h 2001/01/18 20:07:21 1.42
>   +++ apr_portable.h 2001/01/28 15:30:25 1.43
>   @@ -103,8 +103,6 @@
>    typedef SYSTEMTIME            apr_os_exp_time_t;
>    
>    #elif defined(OS2)
>   -#define INCL_DOS
>   -#include <os2.h>
>    typedef HFILE                 apr_os_file_t;
>    typedef HDIR                  apr_os_dir_t;
>    typedef int                   apr_os_sock_t;
>   
>   
>   
>   1.12      +0 -3      apr/include/arch/os2/dso.h
>   
>   Index: dso.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/arch/os2/dso.h,v
>   retrieving revision 1.11
>   retrieving revision 1.12
>   diff -u -r1.11 -r1.12
>   --- dso.h 2000/08/02 05:25:42 1.11
>   +++ dso.h 2001/01/28 15:30:26 1.12
>   @@ -55,9 +55,6 @@
>    #ifndef DSO_H
>    #define DSO_H
>    
>   -#define INCL_DOS
>   -#include <os2.h>
>   -
>    #include "apr_private.h"
>    #include "apr_general.h"
>    #include "apr_pools.h"
>   
>   
>   
>   1.24      +0 -4      apr/include/arch/os2/fileio.h
>   
>   Index: fileio.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/arch/os2/fileio.h,v
>   retrieving revision 1.23
>   retrieving revision 1.24
>   diff -u -r1.23 -r1.24
>   --- fileio.h 2001/01/23 04:10:47 1.23
>   +++ fileio.h 2001/01/28 15:30:26 1.24
>   @@ -55,10 +55,6 @@
>    #ifndef FILE_IO_H
>    #define FILE_IO_H
>    
>   -#define INCL_DOS
>   -#define INCL_DOSERRORS
>   -#include <os2.h>
>   -
>    #include "apr_private.h"
>    #include "apr_general.h"
>    #include "apr_lock.h"
>   
>   
>   
>   1.9       +0 -2      apr/include/arch/os2/locks.h
>   
>   Index: locks.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/arch/os2/locks.h,v
>   retrieving revision 1.8
>   retrieving revision 1.9
>   diff -u -r1.8 -r1.9
>   --- locks.h 2000/08/02 05:26:20 1.8
>   +++ locks.h 2001/01/28 15:30:26 1.9
>   @@ -57,8 +57,6 @@
>    
>    #include "apr_lock.h"
>    #include "apr_file_io.h"
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    struct apr_lock_t {
>        apr_pool_t *cntxt;
>   
>   
>   
>   1.5       +1 -1      apr/include/arch/os2/os2calls.h
>   
>   Index: os2calls.h
>   ===================================================================
>   RCS file: /home/cvs/apr/include/arch/os2/os2calls.h,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -r1.4 -r1.5
>   --- os2calls.h 2000/10/09 06:46:49 1.4
>   +++ os2calls.h 2001/01/28 15:30:26 1.5
>   @@ -52,9 +52,9 @@
>     * <http://www.apache.org/>.
>     */
>    
>   +#include "apr_errno.h"
>    #include <sys/types.h>
>    #include <sys/socket.h>
>   -#include "os2nerrno.h"
>    
>    extern int (*apr_os2_socket)(int, int, int);
>    extern int (*apr_os2_select)(int *, int, int, int, long);
>   
>   
>   
>   1.22      +0 -2      apr/locks/os2/locks.c
>   
>   Index: locks.c
>   ===================================================================
>   RCS file: /home/cvs/apr/locks/os2/locks.c,v
>   retrieving revision 1.21
>   retrieving revision 1.22
>   diff -u -r1.21 -r1.22
>   --- locks.c 2000/11/14 06:40:06 1.21
>   +++ locks.c 2001/01/28 15:30:27 1.22
>   @@ -58,8 +58,6 @@
>    #include "locks.h"
>    #include "fileio.h"
>    #include <string.h>
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    #define CurrentTid (lock->tib->tib_ptib2->tib2_ultid)
>    
>   
>   
>   
>   1.31      +0 -2      apr/misc/unix/errorcodes.c
>   
>   Index: errorcodes.c
>   ===================================================================
>   RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v
>   retrieving revision 1.30
>   retrieving revision 1.31
>   diff -u -r1.30 -r1.31
>   --- errorcodes.c 2001/01/18 20:07:29 1.30
>   +++ errorcodes.c 2001/01/28 15:30:28 1.31
>   @@ -160,8 +160,6 @@
>    
>    
>    #ifdef OS2
>   -#define INCL_DOS
>   -#include <os2.h>
>    #include <ctype.h>
>    
>    int apr_canonical_error(apr_status_t err);
>   
>   
>   
>   1.5       +0 -2      apr/network_io/os2/os2calls.c
>   
>   Index: os2calls.c
>   ===================================================================
>   RCS file: /home/cvs/apr/network_io/os2/os2calls.c,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -r1.4 -r1.5
>   --- os2calls.c 2000/04/08 06:58:41 1.4
>   +++ os2calls.c 2001/01/28 15:30:28 1.5
>   @@ -57,8 +57,6 @@
>    #include "apr_portable.h"
>    #include "apr_general.h"
>    #include "apr_lib.h"
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    static int os2_socket_init(int, int ,int);
>    
>   
>   
>   
>   1.19      +0 -2      apr/network_io/os2/poll.c
>   
>   Index: poll.c
>   ===================================================================
>   RCS file: /home/cvs/apr/network_io/os2/poll.c,v
>   retrieving revision 1.18
>   retrieving revision 1.19
>   diff -u -r1.18 -r1.19
>   --- poll.c 2000/11/13 04:27:50 1.18
>   +++ poll.c 2001/01/28 15:30:29 1.19
>   @@ -59,8 +59,6 @@
>    #include "apr_lib.h"
>    #include <sys/time.h>
>    #include <stdlib.h>
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    /*  OS/2 doesn't have a poll function, implement using OS/2 style select */
>     
>   
>   
>   
>   1.8       +0 -2      apr/shmem/os2/shmem.c
>   
>   Index: shmem.c
>   ===================================================================
>   RCS file: /home/cvs/apr/shmem/os2/shmem.c,v
>   retrieving revision 1.7
>   retrieving revision 1.8
>   diff -u -r1.7 -r1.8
>   --- shmem.c 2000/08/06 16:35:55 1.7
>   +++ shmem.c 2001/01/28 15:30:29 1.8
>   @@ -59,8 +59,6 @@
>    #include "apr_strings.h"
>    #include <umalloc.h>
>    #include <stdlib.h>
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    struct shmem_t {
>        void *memblock;
>   
>   
>   
>   1.36      +0 -1      apr/threadproc/os2/proc.c
>   
>   Index: proc.c
>   ===================================================================
>   RCS file: /home/cvs/apr/threadproc/os2/proc.c,v
>   retrieving revision 1.35
>   retrieving revision 1.36
>   diff -u -r1.35 -r1.36
>   --- proc.c 2000/11/26 03:43:51 1.35
>   +++ proc.c 2001/01/28 15:30:31 1.36
>   @@ -70,7 +70,6 @@
>    #include <unistd.h>
>    #include <process.h>
>    #include <stdlib.h>
>   -#include <os2.h>
>    
>    apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
>    {
>   
>   
>   
>   1.11      +0 -2      apr/threadproc/os2/signals.c
>   
>   Index: signals.c
>   ===================================================================
>   RCS file: /home/cvs/apr/threadproc/os2/signals.c,v
>   retrieving revision 1.10
>   retrieving revision 1.11
>   diff -u -r1.10 -r1.11
>   --- signals.c 2000/11/14 06:40:07 1.10
>   +++ signals.c 2001/01/28 15:30:31 1.11
>   @@ -61,8 +61,6 @@
>    #include <signal.h>
>    #include <string.h>
>    #include <sys/wait.h>
>   -#define INCL_DOS
>   -#include <os2.h>
>    
>    apr_status_t apr_kill(apr_proc_t *proc, int signal)
>    {
>   
>   
>   
>   1.17      +0 -1      apr/threadproc/os2/thread.c
>   
>   Index: thread.c
>   ===================================================================
>   RCS file: /home/cvs/apr/threadproc/os2/thread.c,v
>   retrieving revision 1.16
>   retrieving revision 1.17
>   diff -u -r1.16 -r1.17
>   --- thread.c 2000/11/14 06:40:07 1.16
>   +++ thread.c 2001/01/28 15:30:31 1.17
>   @@ -60,7 +60,6 @@
>    #include "apr_lib.h"
>    #include "fileio.h"
>    #include <stdlib.h>
>   -#include <os2.h>
>    
>    apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
>    {
>   
>   
>   
>   1.33      +0 -4      apr/time/unix/time.c
>   
>   Index: time.c
>   ===================================================================
>   RCS file: /home/cvs/apr/time/unix/time.c,v
>   retrieving revision 1.32
>   retrieving revision 1.33
>   diff -u -r1.32 -r1.33
>   --- time.c 2000/08/06 06:07:32 1.32
>   +++ time.c 2001/01/28 15:30:32 1.33
>   @@ -66,10 +66,6 @@
>    #if HAVE_TIME_H
>    #include <time.h>
>    #endif
>   -#ifdef OS2
>   -#define INCL_DOS
>   -#include <os2.h>
>   -#endif
>    #ifdef BEOS
>    #include <sys/socket.h> /* for select */
>    #endif
>   
>   
>   
> 


Mime
View raw message