Reworked C-alignment check to be clear-as-day.

See bug/pull discussions - http://code.google.com/p/memcached/issues/detail?id=100 - #3 - http://code.google.com/p/memcached/issues/detail?id=360 Conflicts: configure.ac
memcached · Apr 17, 2014 · f19571abcf0aadb169d6aa655df6b20272ef766b · f19571a
1 parent 2fa661a
commit f19571abcf0aadb169d6aa655df6b20272ef766b
Unified Split

Showing with 9 additions and 6 deletions.

+9 −6 configure.ac
diff --git a/configure.ac b/configure.ac
@@ -493,15 +493,18 @@ AC_DEFUN([AC_C_ALIGNMENT],
        *ptr = 0x1;
 
        // catch unaligned word access (ARM cpus)
-       *buf =  1; *(buf +1) = 2; *(buf + 2) = 2; *(buf + 3) = 3; *(buf + 4) = 4;
-       int* i = (int*)(buf+1);
-       return (
 #ifdef ENDIAN_BIG
-                0x02030405
+#define ALIGNMENT 0x02030405
 #else
-                0x05040302
+#define ALIGNMENT 0x05040302
 #endif
-                        == *i) ? 0 : 1;
+       *(buf + 0) = 1;
+       *(buf + 1) = 2;
+       *(buf + 2) = 3;
+       *(buf + 3) = 4;
+       *(buf + 4) = 5;
+       int* i = (int*)(buf+1);
+       return (ALIGNMENT == *i) ? 0 : 1;
     ])
   ],[
     ac_cv_c_alignment=none