Lines 1-22
Link Here
|
1 |
--- src/util/sys_defs.h.orig 2009-05-11 03:45:27.000000000 +0300 |
1 |
--- src/util/sys_defs.h.orig 2010-03-27 22:48:21.000000000 -0400 |
2 |
+++ src/util/sys_defs.h 2009-07-22 21:26:44.208909929 +0300 |
2 |
+++ src/util/sys_defs.h 2010-03-27 22:49:57.000000000 -0400 |
3 |
@@ -25,6 +25,7 @@ |
3 |
@@ -25,7 +25,7 @@ |
4 |
*/ |
4 |
*/ |
5 |
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ |
5 |
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ |
6 |
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ |
6 |
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ |
|
|
7 |
- || defined(FREEBSD8) \ |
7 |
+ || defined(FREEBSD8) || defined(FREEBSD9) \ |
8 |
+ || defined(FREEBSD8) || defined(FREEBSD9) \ |
8 |
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ |
9 |
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ |
9 |
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ |
10 |
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ |
10 |
|| defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ |
11 |
|| defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ |
11 |
@@ -110,6 +111,11 @@ |
12 |
@@ -111,7 +111,8 @@ |
12 |
#define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ |
13 |
#define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ |
13 |
#endif |
14 |
#endif |
14 |
|
15 |
|
|
|
16 |
-#if __FreeBSD_version >= 800098 /* commit: r194262 */ |
15 |
+#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ |
17 |
+#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ |
16 |
+ || __FreeBSD_version >= 800100 |
18 |
+ || __FreeBSD_version >= 800100 |
17 |
+#define HAS_CLOSEFROM |
19 |
#define HAS_CLOSEFROM |
18 |
+#endif |
20 |
#endif |
19 |
+ |
|
|
20 |
/* OpenBSD version is year+month */ |
21 |
|
21 |
|
22 |
#if OpenBSD >= 199805 /* XXX */ |
|
|