equal
deleted
inserted
replaced
1 Adjustments needed to get memcached version 1.4.33 to build with the Studio |
1 Adjustments needed to get memcached version 1.4.35 to build with the Studio |
2 compiler on Solaris. |
2 compiler on Solaris. |
3 |
3 |
4 These changes will be passed upstream. |
4 These changes will be passed upstream. |
5 |
5 |
6 --- memcached-1.4.33/logger.c.orig 2016-11-23 07:59:46.959952180 +0000 |
6 --- memcached-1.4.35/logger.c.orig 2017-03-01 15:11:00.811829274 +0000 |
7 +++ memcached-1.4.33/logger.c 2016-11-23 08:01:04.874324240 +0000 |
7 +++ memcached-1.4.35/logger.c 2017-03-01 15:11:09.009200863 +0000 |
8 @@ -7,6 +7,10 @@ |
8 @@ -11,6 +11,10 @@ |
9 #include <poll.h> |
9 #include <atomic.h> |
10 #include <ctype.h> |
10 #endif |
11 |
11 |
12 +#if !defined(HAVE_GCC_64ATOMICS) && defined(__sun) |
12 +#if !defined(HAVE_GCC_64ATOMICS) && defined(__sun) |
13 +#include <atomic.h> |
13 +#include <atomic.h> |
14 +#endif |
14 +#endif |
15 + |
15 + |
16 #include "memcached.h" |
16 #include "memcached.h" |
17 #include "bipbuffer.h" |
17 #include "bipbuffer.h" |
18 |
18 |
19 --- memcached-1.4.33/memcached.c.orig 2016-11-23 08:01:32.066440520 +0000 |
19 --- memcached-1.4.35/memcached.c.orig 2017-03-01 15:10:36.902614850 +0000 |
20 +++ memcached-1.4.33/memcached.c 2016-11-23 08:01:55.766437536 +0000 |
20 +++ memcached-1.4.35/memcached.c 2017-03-01 15:50:09.188544377 +0000 |
21 @@ -358,8 +358,6 @@ |
21 @@ -364,8 +364,6 @@ |
22 sleep_time); |
22 sleep_time); |
23 usleep((useconds_t) sleep_time * 1000000); |
23 usleep((useconds_t) sleep_time * 1000000); |
24 } |
24 } |
25 - |
25 - |
26 - return NULL; |
26 - return NULL; |