| @@ -1,63 +1,63 @@ | | | @@ -1,63 +1,63 @@ |
1 | $NetBSD: patch-ag,v 1.31 2011/03/22 09:37:27 taca Exp $ | | 1 | $NetBSD: patch-ag,v 1.32 2011/11/07 15:36:07 taca Exp $ |
2 | | | 2 | |
3 | Only define HAS_DB if it hasn't been defined. | | 3 | Only define HAS_DB if it hasn't been defined. |
4 | Add support for NetBSD 5.x and DragonFly BSD. | | 4 | Add support for NetBSD 5.x and DragonFly BSD. |
5 | Handle closefrom() on FreeBSD. | | 5 | Handle closefrom() on FreeBSD. |
6 | | | 6 | |
7 | --- src/util/sys_defs.h.orig 2009-11-14 23:32:37.000000000 +0000 | | 7 | --- src/util/sys_defs.h.orig 2011-11-02 23:46:22.000000000 +0000 |
8 | +++ src/util/sys_defs.h | | 8 | +++ src/util/sys_defs.h |
9 | @@ -29,8 +29,8 @@ | | 9 | @@ -30,8 +30,8 @@ |
10 | || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ | | | |
11 | || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ | | 10 | || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ |
| | | 11 | || defined(OPENBSD5) \ |
12 | || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ | | 12 | || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ |
13 | - || defined(NETBSD4) \ | | 13 | - || defined(NETBSD4) \ |
14 | - || defined(EKKOBSD1) | | 14 | - || defined(EKKOBSD1) |
15 | + || defined(NETBSD4) || defined(NETBSD5) \ | | 15 | + || defined(NETBSD4) || defined(NETBSD5) \ |
16 | + || defined(EKKOBSD1) || defined(DRAGONFLY) | | 16 | + || defined(EKKOBSD1) || defined(DRAGONFLY) |
17 | #define SUPPORTED | | 17 | #define SUPPORTED |
18 | #include <sys/types.h> | | 18 | #include <sys/types.h> |
19 | #include <sys/param.h> | | 19 | #include <sys/param.h> |
20 | @@ -43,7 +43,9 @@ | | 20 | @@ -44,7 +44,9 @@ |
21 | #define DEF_MAILBOX_LOCK "flock, dotlock" | | 21 | #define DEF_MAILBOX_LOCK "flock, dotlock" |
22 | #define HAS_SUN_LEN | | 22 | #define HAS_SUN_LEN |
23 | #define HAS_FSYNC | | 23 | #define HAS_FSYNC |
24 | +#ifndef HAS_DB | | 24 | +#ifndef HAS_DB |
25 | #define HAS_DB | | 25 | #define HAS_DB |
26 | +#endif | | 26 | +#endif |
27 | #define HAS_SA_LEN | | 27 | #define HAS_SA_LEN |
28 | #define DEF_DB_TYPE "hash" | | 28 | #define DEF_DB_TYPE "hash" |
29 | #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) | | 29 | #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) |
30 | @@ -163,9 +166,19 @@ | | 30 | @@ -165,9 +167,19 @@ |
31 | #define HAS_FUTIMES | | 31 | #define HAS_FUTIMES |
32 | #endif | | 32 | #endif |
33 | | | 33 | |
34 | +#if defined(__DragonFly__) | | 34 | +#if defined(__DragonFly__) |
35 | +#define HAS_DEV_URANDOM | | 35 | +#define HAS_DEV_URANDOM |
36 | +#define HAS_ISSETUGID | | 36 | +#define HAS_ISSETUGID |
37 | +#define HAS_FUTIMES | | 37 | +#define HAS_FUTIMES |
38 | +#define SOCKADDR_SIZE socklen_t | | 38 | +#define SOCKADDR_SIZE socklen_t |
39 | +#define SOCKOPT_SIZE socklen_t | | 39 | +#define SOCKOPT_SIZE socklen_t |
40 | +#define HAS_DUPLEX_PIPE | | 40 | +#define HAS_DUPLEX_PIPE |
41 | +#endif | | 41 | +#endif |
42 | + | | 42 | + |
43 | #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \ | | 43 | #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \ |
44 | || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \ | | 44 | || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \ |
45 | || (defined(OpenBSD) && OpenBSD >= 200003) \ | | 45 | || (defined(OpenBSD) && OpenBSD >= 200003) \ |
46 | + || defined(__DragonFly__) \ | | 46 | + || defined(__DragonFly__) \ |
47 | || defined(USAGI_LIBINET6) | | 47 | || defined(USAGI_LIBINET6) |
48 | #ifndef NO_IPV6 | | 48 | #ifndef NO_IPV6 |
49 | # define HAS_IPV6 | | 49 | # define HAS_IPV6 |
50 | @@ -174,14 +187,16 @@ | | 50 | @@ -176,14 +188,16 @@ |
51 | | | 51 | |
52 | #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ | | 52 | #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ |
53 | || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ | | 53 | || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ |
54 | - || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ | | 54 | - || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ |
55 | + || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \ | | 55 | + || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \ |
56 | + || defined(__DragonFly__) | | 56 | + || defined(__DragonFly__) |
57 | # define USE_SYSV_POLL | | 57 | # define USE_SYSV_POLL |
58 | #endif | | 58 | #endif |
59 | | | 59 | |
60 | #ifndef NO_KQUEUE | | 60 | #ifndef NO_KQUEUE |
61 | # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \ | | 61 | # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \ |
62 | || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \ | | 62 | || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \ |
63 | - || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ | | 63 | - || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ |