components/memcached/patches/03-fix-build.patch
branchs11u3-sru
changeset 7510 9eeac2fae18e
child 7722 22eb8cfcabe7
equal deleted inserted replaced
7509:5f98694fa5a6 7510:9eeac2fae18e
       
     1 Adjustments needed to get memcached version 1.4.33 to build with the Studio
       
     2 compiler on Solaris.
       
     3 
       
     4 These changes will be passed upstream.
       
     5 
       
     6 --- memcached-1.4.33/logger.c.orig	2016-11-23 07:59:46.959952180 +0000
       
     7 +++ memcached-1.4.33/logger.c	2016-11-23 08:01:04.874324240 +0000
       
     8 @@ -7,6 +7,10 @@
       
     9  #include <poll.h>
       
    10  #include <ctype.h>
       
    11  
       
    12 +#if !defined(HAVE_GCC_64ATOMICS) && defined(__sun)
       
    13 +#include <atomic.h>
       
    14 +#endif
       
    15 +
       
    16  #include "memcached.h"
       
    17  #include "bipbuffer.h"
       
    18  
       
    19 --- memcached-1.4.33/memcached.c.orig	2016-11-23 08:01:32.066440520 +0000
       
    20 +++ memcached-1.4.33/memcached.c	2016-11-23 08:01:55.766437536 +0000
       
    21 @@ -358,8 +358,6 @@
       
    22                      sleep_time);
       
    23          usleep((useconds_t) sleep_time * 1000000);
       
    24      }
       
    25 -
       
    26 -    return NULL;
       
    27  }
       
    28  
       
    29  static int start_conn_timeout_thread() {