summary refs log tree commit diff
path: root/nscd/nscd_helper.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-03-26 15:37:35 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-04-09 15:05:36 -0500
commit27822ce67fbf7f2b204992a410e7da2e8c1e2607 (patch)
tree6acda311114ef0da18e825c4d26e0013c321a679 /nscd/nscd_helper.c
parenta88ddc902b804a6156f6e5e5feb979754a3e789a (diff)
downloadglibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.tar.gz
glibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.tar.xz
glibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.zip
Define _STRING_ARCH_unaligned unconditionally
This patch defines _STRING_ARCH_unaligned to 0 on default bits/string.h
header to avoid undefined compiler warnings on platforms that do not
define it.  It also make adjustments in code where tests checked if macro
existed or not.
Diffstat (limited to 'nscd/nscd_helper.c')
-rw-r--r--nscd/nscd_helper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 0d61643f10..9fe1f46156 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -490,7 +490,7 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
       struct hashentry *here = (struct hashentry *) (mapped->data + work);
       ref_t here_key, here_packet;
 
-#ifndef _STRING_ARCH_unaligned
+#if !_STRING_ARCH_unaligned
       /* Although during garbage collection when moving struct hashentry
 	 records around we first copy from old to new location and then
 	 adjust pointer from previous hashentry to it, there is no barrier
@@ -512,7 +512,7 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
 	  struct datahead *dh
 	    = (struct datahead *) (mapped->data + here_packet);
 
-#ifndef _STRING_ARCH_unaligned
+#if !_STRING_ARCH_unaligned
 	  if ((uintptr_t) dh & (__alignof__ (*dh) - 1))
 	    return NULL;
 #endif
@@ -536,7 +536,7 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
 	  struct hashentry *trailelem;
 	  trailelem = (struct hashentry *) (mapped->data + trail);
 
-#ifndef _STRING_ARCH_unaligned
+#if !_STRING_ARCH_unaligned
 	  /* We have to redo the checks.  Maybe the data changed.  */
 	  if ((uintptr_t) trailelem & (__alignof__ (*trailelem) - 1))
 	    return NULL;