Merge tag '2.0.7' into tachibanatachibana-mr1tachibana

Change-Id: I7b03d60d67d184c21ff7437a35062077666951e9

1 files changed, 11 insertions, 0 deletions

diff --git a/zbuild.h b/zbuild.h
index 3c5e5fb..17f9810 100644
--- a/zbuild.h
+++ b/zbuild.h
@@ -1,6 +1,10 @@
 #ifndef _ZBUILD_H
 #define _ZBUILD_H
 
+#ifndef _ISOC11_SOURCE
+#  define _ISOC11_SOURCE 1 /* aligned_alloc */
+#endif
+
 /* This has to be first include that defines any types */
 #if defined(_MSC_VER)
 #  if defined(_WIN64)
@@ -33,4 +37,11 @@
 /* Ignore unused variable warning */
 #define Z_UNUSED(var) (void)(var)
 
+#if defined(__has_feature)
+#  if __has_feature(memory_sanitizer)
+#    define Z_MEMORY_SANITIZER 1
+#    include <sanitizer/msan_interface.h>
+#  endif
+#endif
+
 #endif