From 5ff7728c5393cd1ee1dd552e6712589eab1d8a26 Mon Sep 17 00:00:00 2001 From: sezero Date: Mon, 24 Jun 2013 08:10:12 +0000 Subject: [PATCH] oslibs: updated msinttypes to r29 from mainstream googlecode.com repository. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@852 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Windows/VisualStudio/msinttypes/README.txt | 2 +- Windows/VisualStudio/msinttypes/changelog.txt | 18 ++++++++++++++- Windows/VisualStudio/msinttypes/inttypes.h | 7 +++--- Windows/VisualStudio/msinttypes/stdint.h | 22 ++++++++++++++----- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/Windows/VisualStudio/msinttypes/README.txt b/Windows/VisualStudio/msinttypes/README.txt index 1ab14d05..6451c462 100644 --- a/Windows/VisualStudio/msinttypes/README.txt +++ b/Windows/VisualStudio/msinttypes/README.txt @@ -1,5 +1,5 @@ -msinttypes-r26 from: +msinttypes-r29 from: http://msinttypes.googlecode.com/ http://code.google.com/p/msinttypes/ diff --git a/Windows/VisualStudio/msinttypes/changelog.txt b/Windows/VisualStudio/msinttypes/changelog.txt index e13b87e5..dd21167c 100644 --- a/Windows/VisualStudio/msinttypes/changelog.txt +++ b/Windows/VisualStudio/msinttypes/changelog.txt @@ -1,3 +1,19 @@ +------------------------------------------------------------------------ +r29 | 2013-05-25 02:36:43 +0400 | 2 lines + +Fix Issue 9: Surround (U)INTMAX_C with #ifndef's to prevent compiler warnings. + +------------------------------------------------------------------------ +r28 | 2013-05-25 02:32:18 +0400 | 2 lines + +Fix Issue 10: Use system for Visual Studio 2010 and later. + +------------------------------------------------------------------------ +r27 | 2013-05-25 02:24:11 +0400 | 2 lines + +Fix license bug - the name of the product and the names of contributors +must not be used for promotion. + ------------------------------------------------------------------------ r26 | 2009-10-02 13:36:47 +0400 | 2 lines @@ -16,7 +32,7 @@ Forgot about #ifdef __cplusplus guard around 'extern "C"', so inclusion to C fil ------------------------------------------------------------------------ r23 | 2009-05-12 01:27:45 +0400 | 3 lines -[Issue 2] Always wrap with 'extern "C" {}'. It turns out that not only Visual Studio 6 requires this, but also newer versions when compiling for ARM. ------------------------------------------------------------------------ diff --git a/Windows/VisualStudio/msinttypes/inttypes.h b/Windows/VisualStudio/msinttypes/inttypes.h index 4b3828a2..ac7e32b6 100644 --- a/Windows/VisualStudio/msinttypes/inttypes.h +++ b/Windows/VisualStudio/msinttypes/inttypes.h @@ -1,7 +1,7 @@ // ISO C9x compliant inttypes.h for Microsoft Visual Studio // Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 // -// Copyright (c) 2006 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 diff --git a/Windows/VisualStudio/msinttypes/stdint.h b/Windows/VisualStudio/msinttypes/stdint.h index d02608a5..4fe0ef9a 100644 --- a/Windows/VisualStudio/msinttypes/stdint.h +++ b/Windows/VisualStudio/msinttypes/stdint.h @@ -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 @@ typedef uint64_t uintmax_t; #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_ ]