Changeset 2799 for trunk/src/kmk/strcache2.c

Timestamp:

Sep 19, 2015, 10:36:31 PM (10 years ago)

Author:

bird

Message:

Fixed glob.h inclusion issue causing stack corruption. Fixed alignment issue in the string expansion compiler. More makefile eval 'compiler' work.

File:

• trunk/src/kmk/strcache2.c (modified) (1 diff)

trunk/src/kmk/strcache2.c

@@ -75 +75 @@
 #endif
 
-# if defined(__amd64__) || defined(__x86_64__) || defined(__AMD64__) || defined(_M_X64) || defined(__amd64) \
- || defined(__i386__) || defined(__x86__) || defined(__X86__) || defined(_M_IX86) || defined(__i386)
+# if (   defined(__amd64__) || defined(__x86_64__) || defined(__AMD64__) || defined(_M_X64) || defined(__amd64) \
+      || defined(__i386__) || defined(__x86__) || defined(__X86__) || defined(_M_IX86) || defined(__i386)) \
+  && !defined(GCC_ADDRESS_SANITIZER)
 #  define strcache2_get_unaligned_16bits(ptr)   ( *((const uint16_t *)(ptr)))
 # else