r190978 - Fix ifdef ordering at the end of Intrin.h from r190965

[Reid Kleckner]

Author: rnk
Date: Wed Sep 18 19:19:53 2013
New Revision: 190978

URL: http://llvm.org/viewvc/llvm-project?rev=190978&view=rev
Log:
Fix ifdef ordering at the end of Intrin.h from r190965

Test that intrin.h at least parses in C++ TUs.

Added:
    cfe/trunk/test/Headers/ms-intrin.cpp
Modified:
    cfe/trunk/lib/Headers/Intrin.h

Modified: cfe/trunk/lib/Headers/Intrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Intrin.h?rev=190978&r1=190977&r2=190978&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/Intrin.h (original)
+++ cfe/trunk/lib/Headers/Intrin.h Wed Sep 18 19:19:53 2013
@@ -341,9 +341,11 @@ void __cdecl _xrstor64(void const *, uns
 void __cdecl _xsave64(void *, unsigned __int64);
 void __cdecl _xsaveopt64(void *, unsigned __int64);
 
+#endif /* __X86_64__ */
+
 #ifdef __cplusplus
 }
 #endif
-#endif
-#endif
-#endif
+
+#endif /* __INTRIN_H */
+#endif /* _MSC_VER */

Added: cfe/trunk/test/Headers/ms-intrin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/ms-intrin.cpp?rev=190978&view=auto
==============================================================================
--- cfe/trunk/test/Headers/ms-intrin.cpp (added)
+++ cfe/trunk/test/Headers/ms-intrin.cpp Wed Sep 18 19:19:53 2013
@@ -0,0 +1,6 @@
+// RUN: %clang -target i386-pc-win32 -fms-extensions -fsyntax-only %s
+
+#include <Intrin.h>
+
+template <typename T>
+void foo(T V) {}