summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/lib/Headers/tgmath.h4
-rw-r--r--clang/test/Modules/compiler_builtins.m3
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Headers/tgmath.h b/clang/lib/Headers/tgmath.h
index 554af6cf740..1b0b9d24c1d 100644
--- a/clang/lib/Headers/tgmath.h
+++ b/clang/lib/Headers/tgmath.h
@@ -30,9 +30,7 @@
/* C++ handles type genericity with overloading in math.h. */
#ifndef __cplusplus
-#if __has_include(<complex.h>)
-# include <complex.h>
-#endif
+#include <complex.h>
#define _TG_ATTRSp __attribute__((__overloadable__))
#define _TG_ATTRS __attribute__((__overloadable__, __always_inline__))
diff --git a/clang/test/Modules/compiler_builtins.m b/clang/test/Modules/compiler_builtins.m
index 3545604414a..38ce2c98333 100644
--- a/clang/test/Modules/compiler_builtins.m
+++ b/clang/test/Modules/compiler_builtins.m
@@ -1,6 +1,9 @@
// RUN: rm -rf %t
// RUN: %clang -fsyntax-only -fmodules -fmodule-cache-path %t %s -Xclang -verify
+// Note: disable test on MSVC, which doesn't have <complex.h>.
+// REQUIRES: shell
+
@import __compiler_builtins.float_constants;
float getFltMax() { return FLT_MAX; }
OpenPOWER on IntegriCloud