# HG changeset patch # User Sebastien Jodogne # Date 1477564650 -7200 # Node ID e4f8e377782f96799084e1ebc5e4691680445f57 # Parent 0108ac01fc8e6a8f8f6f334a33d3024e27900b54 updated stdint.h for visual studio diff -r 0108ac01fc8e -r e4f8e377782f Resources/ThirdParty/VisualStudio/stdint.h --- a/Resources/ThirdParty/VisualStudio/stdint.h Thu Oct 27 11:43:28 2016 +0200 +++ b/Resources/ThirdParty/VisualStudio/stdint.h Thu Oct 27 12:37:30 2016 +0200 @@ -1,7 +1,7 @@ // ISO C9x compliant stdint.h for Microsoft Visual Studio // Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 // -// Copyright (c) 2006-2008 Alexander Chemeris +// Copyright (c) 2006-2013 Alexander Chemeris // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are met: @@ -13,8 +13,9 @@ // notice, this list of conditions and the following disclaimer in the // documentation and/or other materials provided with the distribution. // -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. +// 3. Neither the name of the product nor the names of its contributors may +// be used to endorse or promote products derived from this software +// without specific prior written permission. // // THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED // WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -40,6 +41,10 @@ #pragma once #endif +#if _MSC_VER >= 1600 // [ +#include +#else // ] _MSC_VER >= 1600 [ + #include // For Visual Studio 6 in C++ mode and for many Visual Studio versions when @@ -238,10 +243,17 @@ #define UINT64_C(val) val##ui64 // 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C +// These #ifndef's are needed to prevent collisions with . +// Check out Issue 9 for the details. +#ifndef INTMAX_C // [ +# define INTMAX_C INT64_C +#endif // INTMAX_C ] +#ifndef UINTMAX_C // [ +# define UINTMAX_C UINT64_C +#endif // UINTMAX_C ] #endif // __STDC_CONSTANT_MACROS ] +#endif // _MSC_VER >= 1600 ] #endif // _MSC_STDINT_H_ ]