| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 13 Dec 2016 06:38:49 -0800 | |
| changeset 7487 | 6506549e143f |
| child 7722 | 22eb8cfcabe7 |
| permissions | -rw-r--r-- |
|
7487
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Adjustments needed to get memcached version 1.4.33 to build with the Studio |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
compiler on Solaris. |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
These changes will be passed upstream. |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- memcached-1.4.33/logger.c.orig 2016-11-23 07:59:46.959952180 +0000 |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ memcached-1.4.33/logger.c 2016-11-23 08:01:04.874324240 +0000 |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -7,6 +7,10 @@ |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
#include <poll.h> |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
#include <ctype.h> |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
|
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+#if !defined(HAVE_GCC_64ATOMICS) && defined(__sun) |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+#include <atomic.h> |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+#endif |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+ |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
#include "memcached.h" |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
#include "bipbuffer.h" |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
|
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
--- memcached-1.4.33/memcached.c.orig 2016-11-23 08:01:32.066440520 +0000 |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
+++ memcached-1.4.33/memcached.c 2016-11-23 08:01:55.766437536 +0000 |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
@@ -358,8 +358,6 @@ |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
sleep_time); |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
usleep((useconds_t) sleep_time * 1000000); |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
} |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
- |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
- return NULL; |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
} |
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
|
|
6506549e143f
25142497 Updated memcached to version 1.4.33
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
static int start_conn_timeout_thread() {
|