diff options
author | Damien Miller <djm@mindrot.org> | 2000-09-29 23:01:36 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-09-29 23:01:36 +1100 |
commit | 78315eb6d6bf411b07d9e0bc1ede41fae9484f25 (patch) | |
tree | 6c1ff91e092df4d86b076f7f4917764bb6d17f5e /defines.h | |
parent | cb5e44a440c1b310a9dc5b8b5abe32fe11ed479b (diff) |
- (djm) Merged big SCO portability patch from Tim Rice
<tim@multitalents.net>
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -11,10 +11,12 @@ | |||
11 | #include <sys/types.h> /* For [u]intxx_t */ | 11 | #include <sys/types.h> /* For [u]intxx_t */ |
12 | #include <sys/socket.h> /* For SHUT_XXXX */ | 12 | #include <sys/socket.h> /* For SHUT_XXXX */ |
13 | #include <sys/param.h> /* For MAXPATHLEN */ | 13 | #include <sys/param.h> /* For MAXPATHLEN */ |
14 | #include <sys/un.h> /* For SUN_LEN */ | ||
15 | #include <netinet/in_systm.h> /* For typedefs */ | 14 | #include <netinet/in_systm.h> /* For typedefs */ |
16 | #include <netinet/in.h> /* For IPv6 macros */ | 15 | #include <netinet/in.h> /* For IPv6 macros */ |
17 | #include <netinet/ip.h> /* For IPTOS macros */ | 16 | #include <netinet/ip.h> /* For IPTOS macros */ |
17 | #ifdef HAVE_SYS_UN_H | ||
18 | # include <sys/un.h> /* For SUN_LEN */ | ||
19 | #endif | ||
18 | #ifdef HAVE_SYS_BITYPES_H | 20 | #ifdef HAVE_SYS_BITYPES_H |
19 | # include <sys/bitypes.h> /* For u_intXX_t */ | 21 | # include <sys/bitypes.h> /* For u_intXX_t */ |
20 | #endif | 22 | #endif |
@@ -44,6 +46,7 @@ | |||
44 | #endif | 46 | #endif |
45 | 47 | ||
46 | #include <unistd.h> /* For STDIN_FILENO, etc */ | 48 | #include <unistd.h> /* For STDIN_FILENO, etc */ |
49 | #include <termios.h> /* Struct winsize */ | ||
47 | 50 | ||
48 | /* Constants */ | 51 | /* Constants */ |
49 | 52 | ||
@@ -219,6 +222,23 @@ typedef int mode_t; | |||
219 | # define ss_family __ss_family | 222 | # define ss_family __ss_family |
220 | #endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */ | 223 | #endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */ |
221 | 224 | ||
225 | #ifndef HAVE_SYS_UN_H | ||
226 | struct sockaddr_un { | ||
227 | short sun_family; /* AF_UNIX */ | ||
228 | char sun_path[108]; /* path name (gag) */ | ||
229 | }; | ||
230 | #endif /* HAVE_SYS_UN_H */ | ||
231 | |||
232 | #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) | ||
233 | #define _STRUCT_WINSIZE | ||
234 | struct winsize { | ||
235 | unsigned short ws_row; /* rows, in characters */ | ||
236 | unsigned short ws_col; /* columns, in character */ | ||
237 | unsigned short ws_xpixel; /* horizontal size, pixels */ | ||
238 | unsigned short ws_ypixel; /* vertical size, pixels */ | ||
239 | }; | ||
240 | #endif | ||
241 | |||
222 | /* Paths */ | 242 | /* Paths */ |
223 | 243 | ||
224 | #ifndef _PATH_BSHELL | 244 | #ifndef _PATH_BSHELL |