--- a/tools/clang/lib/Headers/stdint.h	2011-04-30 23:02:59.000000000 +0400
+++ b/tools/clang/lib/Headers/stdint.h	2012-08-03 12:54:22.851687999 +0400
@@ -22,8 +22,6 @@
  *
 \*===----------------------------------------------------------------------===*/
 
-#ifndef __CLANG_STDINT_H
-#define __CLANG_STDINT_H
 
 /* If we're hosted, fall back to the system's stdint.h, which might have
  * additional definitions.
@@ -32,6 +30,8 @@
     defined(__has_include_next) && __has_include_next(<stdint.h>)
 # include_next <stdint.h>
 #else
+#ifndef __CLANG_STDINT_H
+#define __CLANG_STDINT_H
 
 /* C99 7.18.1.1 Exact-width integer types.
  * C99 7.18.1.2 Minimum-width integer types.
@@ -657,5 +657,5 @@
 #define INTMAX_C(v)   __INTN_C(__INTMAX_WIDTH__, v)
 #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v)
 
-#endif /* __STDC_HOSTED__ */
 #endif /* __CLANG_STDINT_H */
+#endif /* __STDC_HOSTED__ */