aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-01-29 23:53:54 +0000
committerDouglas Gregor <dgregor@apple.com>2012-01-29 23:53:54 +0000
commitebb1004d09968f51ec22bde2225112709dc0f386 (patch)
treeda599da5adf815085ea0eb548b6cef8c363f3237
parent8101c7f8a9b9494014db5da9f88b50e69f90acf4 (diff)
Just disable the compiler-builtins module test on MSVC for now
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149214 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/tgmath.h4
-rw-r--r--test/Modules/compiler_builtins.m3
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Headers/tgmath.h b/lib/Headers/tgmath.h
index 554af6cf74..1b0b9d24c1 100644
--- a/lib/Headers/tgmath.h
+++ b/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/test/Modules/compiler_builtins.m b/test/Modules/compiler_builtins.m
index 3545604414..38ce2c9833 100644
--- a/test/Modules/compiler_builtins.m
+++ b/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; }