| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 11 Feb 2014 20:51:55 -0800 | |
| branch | s11-update |
| changeset 2947 | 38d16c6d5c60 |
| permissions | -rw-r--r-- |
|
2947
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Teach it about Solaris. This patch will be pushed upstream. |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
--- zendopcache-7.0.2/config.m4_orig 2013-06-04 23:28:53.000000000 -0700 |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
+++ zendopcache-7.0.2/config.m4 2013-07-19 11:01:46.373047462 -0700 |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
@@ -338,7 +338,7 @@ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
struct flock name = {start, len, -1, type, whence}
|
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
-# elif defined(__svr4__) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
+# elif defined(__svr4__) || defined (__SunOS) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
struct flock name = {type, whence, start, len}
|
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
# elif defined(__linux__) || defined(__hpux) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
--- zendopcache-7.0.2/ZendAccelerator.h_orig 2013-06-04 23:28:53.000000000 -0700 |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+++ zendopcache-7.0.2/ZendAccelerator.h 2013-07-19 11:07:03.956873718 -0700 |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -97,7 +97,7 @@ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
struct flock name = {start, len, -1, type, whence}
|
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
-# elif defined(__svr4__) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+# elif defined(__svr4__) || defined (__SunOS) |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ |
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
struct flock name = {type, whence, start, len}
|
|
38d16c6d5c60
PSARC 2013/306 zendopcache version 7.0.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
# elif defined(__linux__) || defined(__hpux) |