summaryrefslogtreecommitdiffstats
path: root/test/modularize
diff options
context:
space:
mode:
authorJohn Thompson <John.Thompson.JTSoftware@gmail.com>2013-07-27 00:54:17 +0000
committerJohn Thompson <John.Thompson.JTSoftware@gmail.com>2013-07-27 00:54:17 +0000
commitc5121dd100ba20831f1882490f76519f48aee5d4 (patch)
treea304420facb9498f3f2c54f4856247052cd172c0 /test/modularize
parent590f0d6ce0ce62974c9153b69080a674b259f469 (diff)
Fixed missing checkin.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@187282 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/modularize')
-rw-r--r--test/modularize/Inputs/InconsistentSubHeader.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/modularize/Inputs/InconsistentSubHeader.h b/test/modularize/Inputs/InconsistentSubHeader.h
index 92e7d036..ab02b250 100644
--- a/test/modularize/Inputs/InconsistentSubHeader.h
+++ b/test/modularize/Inputs/InconsistentSubHeader.h
@@ -1,11 +1,18 @@
// Set up so TypeInt only defined during InconsistentHeader1.h include.
#ifdef SYMBOL1
#define SYMBOL 1
+#define FUNC_STYLE(a, b) a || b
#endif
#ifdef SYMBOL2
#define SYMBOL 2
+#define FUNC_STYLE(a, b) a &&b
#endif
#if SYMBOL == 1
typedef int TypeInt;
#endif
+
+int var = FUNC_STYLE(1, 0);
+
+#if defined(SYMBOL1)
+#endif