diff options
Diffstat (limited to 'include/arch/os2')
| -rw-r--r-- | include/arch/os2/dso.h | 3 | ||||
| -rw-r--r-- | include/arch/os2/fileio.h | 4 | ||||
| -rw-r--r-- | include/arch/os2/locks.h | 2 | ||||
| -rw-r--r-- | include/arch/os2/os2calls.h | 2 | ||||
| -rw-r--r-- | include/arch/os2/os2nerrno.h | 51 |
5 files changed, 1 insertions, 61 deletions
diff --git a/include/arch/os2/dso.h b/include/arch/os2/dso.h index 1597c81d1..dd3e9223d 100644 --- a/include/arch/os2/dso.h +++ b/include/arch/os2/dso.h @@ -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" diff --git a/include/arch/os2/fileio.h b/include/arch/os2/fileio.h index d1abad34a..a34b05d85 100644 --- a/include/arch/os2/fileio.h +++ b/include/arch/os2/fileio.h @@ -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" diff --git a/include/arch/os2/locks.h b/include/arch/os2/locks.h index 50ffdc652..6864e49be 100644 --- a/include/arch/os2/locks.h +++ b/include/arch/os2/locks.h @@ -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; diff --git a/include/arch/os2/os2calls.h b/include/arch/os2/os2calls.h index 8a8b83bd0..2dcb86c67 100644 --- a/include/arch/os2/os2calls.h +++ b/include/arch/os2/os2calls.h @@ -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); diff --git a/include/arch/os2/os2nerrno.h b/include/arch/os2/os2nerrno.h deleted file mode 100644 index 0d6b444e2..000000000 --- a/include/arch/os2/os2nerrno.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef __OS2NERRNO_H -#define __OS2NERRNO_H - -/* Error codes returned by above calls */ -#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 */ - -#endif |