Add test for intsafe.h to config

Author: tbeu

cmake/compilerOptions.cmake

@@ -13,6 +13,7 @@ check_symbol_exists(localeconv locale.h   HAVE_LOCALECONV)
 include(CheckIncludeFile)
 check_include_file(inttypes.h HAVE_INTTYPES_H)
 check_include_file(stdint.h   HAVE_STDINT_H)
+check_include_file(intsafe.h  HAVE_INTSAFE_H)
 check_include_file(strings.h  HAVE_STRINGS_H)
 check_include_file(ctype.h    HAVE_CTYPE_H)
 check_include_file(stdlib.h   HAVE_STDLIB_H)

cmake/matioConfig.cmake.in

@@ -59,6 +59,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the <intsafe.h> header file. */
+#cmakedefine HAVE_INTSAFE_H 1
+
 /* Define to 1 if you have the `m' library (-lm). */
 #cmakedefine HAVE_LIBM 1
 

configure.ac

@@ -148,6 +148,7 @@ AC_CHECK_HEADERS_ONCE([stdarg.h])
 AC_CHECK_HEADERS_ONCE([varargs.h])
 AC_CHECK_HEADER([inttypes.h],[AC_DEFINE_UNQUOTED([MATIO_HAVE_INTTYPES_H],[1],[Matio has access to inttypes.h])])
 AC_CHECK_HEADER([stdint.h],[AC_DEFINE_UNQUOTED([MATIO_HAVE_STDINT_H],[1],[Matio has access to stdint.h])])
+AC_CHECK_HEADER([intsafe.h],[AC_DEFINE_UNQUOTED([HAVE_INTSAFE_H],[1],[Matio has access to intsafe.h])])
 AC_CHECK_HEADER([strings.h],[AC_DEFINE_UNQUOTED([HAVE_STRINGS_H],[1],[Matio has access to strings.h])])
 AC_CHECK_HEADER([unistd.h],[AC_DEFINE_UNQUOTED([HAVE_UNISTD_H],[1],[Matio has access to unistd.h])])
 AC_CHECK_HEADERS([locale.h stddef.h])

src/matioConfig.h.in

@@ -59,6 +59,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <intsafe.h> header file. */
+#undef HAVE_INTSAFE_H
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 

src/safe-math.h

@@ -19,7 +19,9 @@
 #  elif defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__INTEL_COMPILER)
 #    define PSNIP_SAFE_HAVE_BUILTIN_OVERFLOW
 #  endif
-#  if defined(__has_include)
+#  if defined(HAVE_INTSAFE_H)
+#    define PSNIP_SAFE_HAVE_INTSAFE_H
+#  elif defined(__has_include)
 #    if __has_include(<intsafe.h>)
 #      define PSNIP_SAFE_HAVE_INTSAFE_H
 #    endif
@@ -716,9 +718,9 @@ PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned short, ushort, add)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned short, ushort, sub)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned short, ushort, mul)
 #elif defined(PSNIP_SAFE_HAVE_INTSAFE_H)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned short, ushort, add, UShortAdd)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned short, ushort, sub, UShortSub)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned short, ushort, mul, UShortMult)
+PSNIP_SAFE_DEFINE_INTSAFE(USHORT, ushort, add, UShortAdd)
+PSNIP_SAFE_DEFINE_INTSAFE(USHORT, ushort, sub, UShortSub)
+PSNIP_SAFE_DEFINE_INTSAFE(USHORT, ushort, mul, UShortMult)
 #elif defined(PSNIP_SAFE_HAVE_LARGER_USHORT)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned short, ushort, add, USHRT_MAX)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned short, ushort, sub, USHRT_MAX)
@@ -753,9 +755,9 @@ PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned int, uint, add)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned int, uint, sub)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned int, uint, mul)
 #elif defined(PSNIP_SAFE_HAVE_INTSAFE_H)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned int, uint, add, UIntAdd)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned int, uint, sub, UIntSub)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned int, uint, mul, UIntMult)
+PSNIP_SAFE_DEFINE_INTSAFE(UINT, uint, add, UIntAdd)
+PSNIP_SAFE_DEFINE_INTSAFE(UINT, uint, sub, UIntSub)
+PSNIP_SAFE_DEFINE_INTSAFE(UINT, uint, mul, UIntMult)
 #elif defined(PSNIP_SAFE_HAVE_LARGER_UINT)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned int, uint, add, UINT_MAX)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned int, uint, sub, UINT_MAX)
@@ -790,9 +792,9 @@ PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long, ulong, add)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long, ulong, sub)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long, ulong, mul)
 #elif defined(PSNIP_SAFE_HAVE_INTSAFE_H)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long, ulong, add, ULongAdd)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long, ulong, sub, ULongSub)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long, ulong, mul, ULongMult)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONG, ulong, add, ULongAdd)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONG, ulong, sub, ULongSub)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONG, ulong, mul, ULongMult)
 #elif defined(PSNIP_SAFE_HAVE_LARGER_ULONG)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned long, ulong, add, ULONG_MAX)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned long, ulong, sub, ULONG_MAX)
@@ -827,9 +829,9 @@ PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long long, ullong, add)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long long, ullong, sub)
 PSNIP_SAFE_DEFINE_BUILTIN_BINARY_OP(unsigned long long, ullong, mul)
 #elif defined(PSNIP_SAFE_HAVE_INTSAFE_H)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long long, ullong, add, ULongLongAdd)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long long, ullong, sub, ULongLongSub)
-PSNIP_SAFE_DEFINE_INTSAFE(unsigned long long, ullong, mul, ULongLongMult)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONGLONG, ullong, add, ULongLongAdd)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONGLONG, ullong, sub, ULongLongSub)
+PSNIP_SAFE_DEFINE_INTSAFE(ULONGLONG, ullong, mul, ULongLongMult)
 #elif defined(PSNIP_SAFE_HAVE_LARGER_ULLONG)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned long long, ullong, add, ULLONG_MAX)
 PSNIP_SAFE_DEFINE_PROMOTED_UNSIGNED_BINARY_OP(unsigned long long, ullong, sub, ULLONG_MAX)

visual_studio/matioConfig.h

@@ -64,6 +64,13 @@
 #undef HAVE_INTTYPES_H
 #endif
 
+/* Define to 1 if you have the <intsafe.h> header file. */
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+#define HAVE_INTSAFE_H 1
+#else
+#undef HAVE_INTSAFE_H
+#endif
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 

visual_studio/matio_pubconf.h

@@ -153,7 +153,7 @@
     typedef _mat_uint8_t mat_uint8_t;
 #endif
 
-/* 
+/*
   The following macros handle noreturn attributes according to the latest
   C11/C++11 standard with fallback to the MSVC extension if using an older
   compiler.