[compiler-rt] r204515 - InstrProf: Remove MSVC-specific logic

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Fri Mar 21 15:59:08 2014
New Revision: 204515

URL: http://llvm.org/viewvc/llvm-project?rev=204515&view=rev
Log:
InstrProf: Remove MSVC-specific logic

Apparently, MSVC has stdint.h now?  Let's see if the buildbots complain.
I'm not convinced that the build system is even set up for MSVC to build
this file, but...

Modified:
    compiler-rt/trunk/lib/profile/InstrProfiling.h

Modified: compiler-rt/trunk/lib/profile/InstrProfiling.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfiling.h?rev=204515&r1=204514&r2=204515&view=diff
==============================================================================
--- compiler-rt/trunk/lib/profile/InstrProfiling.h (original)
+++ compiler-rt/trunk/lib/profile/InstrProfiling.h Fri Mar 21 15:59:08 2014
@@ -10,27 +10,21 @@
 #ifndef PROFILE_INSTRPROFILING_H_
 #define PROFILE_INSTRPROFILING_H_
 
-#define I386_FREEBSD (defined(__FreeBSD__) && defined(__i386__))
+#if defined(__FreeBSD__) && defined(__i386__)
 
-#if !I386_FREEBSD
-#include <inttypes.h>
-#endif
-
-#if !defined(_MSC_VER) && !I386_FREEBSD
-#include <stdint.h>
-#endif
-
-#if defined(_MSC_VER)
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-#elif I386_FREEBSD
 /* System headers define 'size_t' incorrectly on x64 FreeBSD (prior to
  * FreeBSD 10, r232261) when compiled in 32-bit mode.
  */
 #define PRIu64 "llu"
 typedef unsigned int uint32_t;
 typedef unsigned long long uint64_t;
-#endif
+
+#else /* defined(__FreeBSD__) && defined(__i386__) */
+
+#include <inttypes.h>
+#include <stdint.h>
+
+#endif /* defined(__FreeBSD__) && defined(__i386__) */
 
 #define PROFILE_HEADER_SIZE 7