Remove bitfield hack (solaris blows anyways).

diff --git a/libhashkit/configure.h.in b/libhashkit/configure.h.in
index 6fa78177bf36ebde43afbdb620132103f52748f3..29d05aeab6729bca74a8bde411de2db0d827992e 100644 (file)
--- a/libhashkit/configure.h.in
+++ b/libhashkit/configure.h.in
@@ -12,8 +12,6 @@
 extern "C" {
 #endif
 
-@HASHKIT_BITFIELD@
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index e3d5862e905f6f5867bde504e83a9136f87009c1..451333075f225c83641647dcd93065db946935f1 100644 (file)
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -58,11 +58,11 @@ struct hashkit_st
   } base_hash, distribution_hash;
 
   struct {
-    bool is_base_same_distributed HASHKIT_BITFIELD;
+    bool is_base_same_distributed:1;
   } flags;
 
   struct {
-    bool is_allocated HASHKIT_BITFIELD;
+    bool is_allocated:1;
   } options;
 };
 

diff --git a/libmemcached/configure.h.in b/libmemcached/configure.h.in
index c030d3054c6ed7ed21f6dc0ad016c79129cd6d3b..c45cc8031906e798372703148dd648ea5d4a05fd 100644 (file)
--- a/libmemcached/configure.h.in
+++ b/libmemcached/configure.h.in
@@ -16,7 +16,6 @@
 extern "C" {
 #endif
 
-@MEMCACHED_BITFIELD@
 @DEPRECATED@
 @LIBMEMCACHED_WITH_SASL_SUPPORT@
 

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 5aca6db122074ed962cd7b53362f8c7d7489bd7a..81120c5427c472eabd1c2b67fa0957438c138d80 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -60,27 +60,27 @@ struct memcached_st {
     @note these are static and should not change without a call to behavior.
   */
   struct {
-    bool is_purging MEMCACHED_BITFIELD;
-    bool is_processing_input MEMCACHED_BITFIELD;
+    bool is_purging:1;
+    bool is_processing_input:1;
   } state;
   struct {
     // Everything below here is pretty static.
-    bool auto_eject_hosts MEMCACHED_BITFIELD;
-    bool binary_protocol MEMCACHED_BITFIELD;
-    bool buffer_requests MEMCACHED_BITFIELD;
-    bool cork MEMCACHED_BITFIELD;
-    bool hash_with_prefix_key MEMCACHED_BITFIELD;
-    bool ketama_weighted MEMCACHED_BITFIELD;
-    bool no_block MEMCACHED_BITFIELD;
-    bool no_reply MEMCACHED_BITFIELD;
-    bool randomize_replica_read MEMCACHED_BITFIELD;
-    bool reuse_memory MEMCACHED_BITFIELD;
-    bool support_cas MEMCACHED_BITFIELD;
-    bool tcp_nodelay MEMCACHED_BITFIELD;
-    bool use_cache_lookups MEMCACHED_BITFIELD;
-    bool use_sort_hosts MEMCACHED_BITFIELD;
-    bool use_udp MEMCACHED_BITFIELD;
-    bool verify_key MEMCACHED_BITFIELD;
+    bool auto_eject_hosts:1;
+    bool binary_protocol:1;
+    bool buffer_requests:1;
+    bool cork:1;
+    bool hash_with_prefix_key:1;
+    bool ketama_weighted:1;
+    bool no_block:1;
+    bool no_reply:1;
+    bool randomize_replica_read:1;
+    bool reuse_memory:1;
+    bool support_cas:1;
+    bool tcp_nodelay:1;
+    bool use_cache_lookups:1;
+    bool use_sort_hosts:1;
+    bool use_udp:1;
+    bool verify_key:1;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -129,13 +129,13 @@ struct memcached_st {
     ** Did we allocate data inside the callbacks, or did the user
     ** supply that.
     */
-    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_allocated:1;
   } sasl;
 
 #endif
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_allocated:1;
   } options;
 
 };

diff --git a/libmemcached/result.h b/libmemcached/result.h
index 59ce9b91b1baba26a8cf096786781b0b945f3078..46ea6eff2def0544982317bacf89b9f4ca5da6d0 100644 (file)
--- a/libmemcached/result.h
+++ b/libmemcached/result.h
@@ -21,8 +21,8 @@ struct memcached_result_st {
   memcached_string_st value;
   char item_key[MEMCACHED_MAX_KEY];
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
-    bool is_initialized MEMCACHED_BITFIELD;
+    bool is_allocated:1;
+    bool is_initialized:1;
   } options;
   /* Add result callback function */
 };

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 44a32bba46c0627329994e17dbabad9fb08c414d..92e6d88888d9594df71076ddc76ea721da60684e 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -15,10 +15,10 @@
 
 struct memcached_server_st {
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
-    bool is_initialized MEMCACHED_BITFIELD;
-    bool sockaddr_inited MEMCACHED_BITFIELD;
-    bool is_shutting_down MEMCACHED_BITFIELD;
+    bool is_allocated:1;
+    bool is_initialized:1;
+    bool sockaddr_inited:1;
+    bool is_shutting_down:1;
   } options;
   uint32_t number_of_hosts;
   uint32_t cursor_active;

diff --git a/libmemcached/string.h b/libmemcached/string.h
index ef567874248a8b47c408648818f8f7398e99f888..ca2c1220943a60ae93f9c8b77aaddccd31eb2bf5 100644 (file)
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -28,8 +28,8 @@ struct memcached_string_st {
   size_t current_size;
   const memcached_st *root;
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
-    bool is_initialized MEMCACHED_BITFIELD;
+    bool is_allocated:1;
+    bool is_initialized:1;
   } options;
 };
 

diff --git a/m4/bitfield.m4 b/m4/bitfield.m4
deleted file mode 100644 (file)
index 594855c..0000000
--- a/m4/bitfield.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-AC_DEFUN([DETECT_BITFIELD],
-[
-    AC_CACHE_CHECK([for working bitfield],[ac_cv_have_bitfield],[
-    AC_LANG_PUSH([C])
-    save_CFLAGS="${CFLAGS}"
-    CFLAGS="${AM_CFLAGS} ${NO_WERROR}"
-
-    AC_RUN_IFELSE([
-       AC_LANG_PROGRAM([[
-#include <stdbool.h>
-       ]],[[
-   struct flags { bool b0:1; bool b1:1; bool b2:1; bool b3:1;
-                  bool b4:1; bool b5:1; bool b6:1; bool b7:1;
-   } f = { .b0 = false, .b1 = false, .b2 = false, .b3 = false,
-           .b4 = false, .b5 = false, .b6 = false, .b7 = false };
-
-   f.b0 = true;
-   f.b1 = false;
-   f.b2 = true;
-   f.b3 = false;
-   f.b4 = true;
-   f.b5 = false;
-   f.b6 = true;
-   f.b7 = false;
-
-   if (f.b0 && !f.b1 && f.b2 && !f.b3 && f.b4 && !f.b5 && f.b6 && !f.b7) {
-      return 0;
-   }
-
-   return 1;
-       ]])
-    ], [
-      ac_cv_have_bitfield=yes
-    ],[
-      ac_cv_have_bitfield=no
-    ])])
-
-    CFLAGS=${save_CFLAGS}
-    AS_IF([test "x$ac_cv_have_bitfield" = "xyes"],
-          [
-           MEMCACHED_BITFIELD="#define MEMCACHED_BITFIELD :1"
-           HASHKIT_BITFIELD="#define HASHKIT_BITFIELD :1"
-         ],
-          [
-           MEMCACHED_BITFIELD="#define MEMCACHED_BITFIELD"
-           HASHKIT_BITFIELD="#define HASHKIT_BITFIELD"
-         ])
-    AC_SUBST([MEMCACHED_BITFIELD])
-    AC_SUBST([HASHKIT_BITFIELD])
-    AC_LANG_POP()
-])