From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 23 Apr 2013 00:47:34 +0000 (-0400)
Subject: remove __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS checks in stdint.h
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=43653c1250ad5eb5385d7e08292ad047420f8d25;ds=sidebyside

remove __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS checks in stdint.h

C++11, the first C++ with stdint.h, requires the previously protected
macros to be exposed unconditionally by stdint.h. apparently these
checks were an early attempt by the C committee to guess what the C++
committee would want, and they guessed wrong.
---

diff --git a/include/stdint.h b/include/stdint.h
index 138fb211..76284048 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -39,8 +39,6 @@ typedef uint16_t uint_least16_t;
 typedef uint32_t uint_least32_t;
 typedef uint64_t uint_least64_t;
 
-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
-
 #define INT8_MIN   (-1-0x7f)
 #define INT16_MIN  (-1-0x7fff)
 #define INT32_MIN  (-1-0x7fffffff)
@@ -88,10 +86,6 @@ typedef uint64_t uint_least64_t;
 
 #include <bits/stdint.h>
 
-#endif
-
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
-
 #define INT8_C(c)  c
 #define INT16_C(c) c
 #define INT32_C(c) c
@@ -113,5 +107,3 @@ typedef uint64_t uint_least64_t;
 #endif
 
 #endif
-
-#endif