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

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

llvm-svn: 190978

clang/lib/Headers/Intrin.h

@@ -341,9 +341,11 @@ void __cdecl _xrstor64(void const *, unsigned __int64);
 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 */

clang/test/Headers/ms-intrin.cpp

@@ -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) {}