svn merge ^/branches/released .

12 files changed, 760 insertions, 433 deletions

diff --git a/include/inttypes.h b/include/inttypes.h
index b6dcf1662..25542771f 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,245 +1,305 @@
-/* inttypes.h - fixed size integer types
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _INTTYPES_H
-#define _INTTYPES_H
-
-#include <stdint.h>
-
-/* fprintf() macros for signed integers */
-
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "ld"
-#define PRId64 "lld"
-
-#define PRIdLEAST8 "d"
-#define PRIdLEAST16 "d"
-#define PRIdLEAST32 "ld"
-#define PRIdLEAST64 "lld"
-
-#define PRIdFAST8 "d"
-#define PRIdFAST16 "ld"
-#define PRIdFAST32 "ld"
-#define PRIdFAST64 "lld"
-
-#define PRIdMAX "lld"
-#define PRIdPTR "ld"
-
-#define PRIi8 "i"
-#define PRIi16 "i"
-#define PRIi32 "li"
-#define PRIi64 "lli"
-
-#define PRIiLEAST8 "i"
-#define PRIiLEAST16 "i"
-#define PRIiLEAST32 "li"
-#define PRIiLEAST64 "lli"
-
-#define PRIiFAST8 "i"
-#define PRIiFAST16 "li"
-#define PRIiFAST32 "li"
-#define PRIiFAST64 "lli"
-
-#define PRIiMAX "lli"
-#define PRIiPTR "li"
-
-/* fprintf() macros for unsigned integers */
-
-#define PRIo8 "o"
-#define PRIo16 "o"
-#define PRIo32 "lo"
-#define PRIo64 "llo"
-
-#define PRIoLEAST8 "o"
-#define PRIoLEAST16 "o"
-#define PRIoLEAST32 "lo"
-#define PRIoLEAST64 "llo"
-
-#define PRIoFAST8 "o"
-#define PRIoFAST16 "lo"
-#define PRIoFAST32 "lo"
-#define PRIoFAST64 "llo"
-
-#define PRIoMAX "llo"
-#define PRIoPTR "lo"
-
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "lu"
-#define PRIu64 "llu"
-
-#define PRIuLEAST8 "u"
-#define PRIuLEAST16 "u"
-#define PRIuLEAST32 "lu"
-#define PRIuLEAST64 "llu"
-
-#define PRIuFAST8 "u"
-#define PRIuFAST16 "lu"
-#define PRIuFAST32 "lu"
-#define PRIuFAST64 "llu"
-
-#define PRIuMAX "llu"
-#define PRIuPTR "lu"
-
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "lx"
-#define PRIx64 "llx"
-
-#define PRIxLEAST8 "x"
-#define PRIxLEAST16 "x"
-#define PRIxLEAST32 "lx"
-#define PRIxLEAST64 "llx"
-
-#define PRIxFAST8 "x"
-#define PRIxFAST16 "lx"
-#define PRIxFAST32 "lx"
-#define PRIxFAST64 "llx"
-
-#define PRIxMAX "llx"
-#define PRIxPTR "lx"
-
-#define PRIX8 "X"
-#define PRIX16 "X"
-#define PRIX32 "lX"
-#define PRIX64 "llX"
-
-#define PRIXLEAST8 "X"
-#define PRIXLEAST16 "X"
-#define PRIXLEAST32 "lX"
-#define PRIXLEAST64 "llX"
-
-#define PRIXFAST8 "X"
-#define PRIXFAST16 "lX"
-#define PRIXFAST32 "lX"
-#define PRIXFAST64 "llX"
-
-#define PRIXMAX "llX"
-#define PRIXPTR "lX"
-
-/* fscanf() macros for signed integers */
-
-#define SCNd8 "hhd"
-#define SCNd16 "hd"
-#define SCNd32 "ld"
-#define SCNd64 "lld"
-
-#define SCNdLEAST8 "hhd"
-#define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "ld"
-#define SCNdLEAST64 "lld"
-
-#define SCNdFAST8 "hhd"
-#define SCNdFAST16 "ld"
-#define SCNdFAST32 "ld"
-#define SCNdFAST64 "lld"
-
-#define SCNdMAX "lld"
-#define SCNdPTR "ld"
-
-#define SCNi8 "hhi"
-#define SCNi16 "hi"
-#define SCNi32 "li"
-#define SCNi64 "lli"
-
-#define SCNiLEAST8 "hhi"
-#define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "li"
-#define SCNiLEAST64 "lli"
-
-#define SCNiFAST8 "hhi"
-#define SCNiFAST16 "li"
-#define SCNiFAST32 "li"
-#define SCNiFAST64 "lli"
-
-#define SCNiMAX "lli"
-#define SCNiPTR "li"
-
-/* fscanf() macros for unsigned integers */
-
-#define SCNo8 "hho"
-#define SCNo16 "ho"
-#define SCNo32 "lo"
-#define SCNo64 "llo"
-
-#define SCNoLEAST8 "hho"
-#define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "lo"
-#define SCNoLEAST64 "llo"
-
-#define SCNoFAST8 "hho"
-#define SCNoFAST16 "lo"
-#define SCNoFAST32 "lo"
-#define SCNoFAST64 "llo"
-
-#define SCNoMAX "llo"
-#define SCNoPTR "lo"
-
-#define SCNu8 "hhu"
-#define SCNu16 "hu"
-#define SCNu32 "lu"
-#define SCNu64 "llu"
-
-#define SCNuLEAST8 "hhu"
-#define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "lu"
-#define SCNuLEAST64 "llu"
-
-#define SCNuFAST8 "hhu"
-#define SCNuFAST16 "lu"
-#define SCNuFAST32 "lu"
-#define SCNuFAST64 "llu"
-
-#define SCNuMAX "llu"
-#define SCNuPTR "lu"
-
-#define SCNx8 "hhx"
-#define SCNx16 "hx"
-#define SCNx32 "lx"
-#define SCNx64 "llx"
-
-#define SCNxLEAST8 "hhx"
-#define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "lx"
-#define SCNxLEAST64 "llx"
-
-#define SCNxFAST8 "hhx"
-#define SCNxFAST16 "lx"
-#define SCNxFAST32 "lx"
-#define SCNxFAST64 "llx"
-
-#define SCNxMAX "llx"
-#define SCNxPTR "lx"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-  intmax_t quot;
-  intmax_t rem;
-} imaxdiv_t;
-
-#if 0 /* Not yet defined */
-intmax_t _EXFUN(imaxabs, (intmax_t));
-imaxdiv_t _EXFUN(imaxdiv, (intmax_t, intmax_t));
-intmax_t _EXFUN(strtoimax, (const char *, char **, int));
-uintmax_t _EXFUN(strtoumax, (const char *, char **, int));
-
-intmax_t _EXFUN(wcstoimax, (const wchar_t *, wchar_t **, int));
-uintmax_t _EXFUN(wcstoumax, (const wchar_t *, wchar_t **, int));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INTTYPES_H */
+// 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

+// 

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are met:

+// 

+//   1. Redistributions of source code must retain the above copyright notice,

+//      this list of conditions and the following disclaimer.

+// 

+//   2. Redistributions in binary form must reproduce the above copyright

+//      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.

+// 

+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;

+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 

+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+// 

+///////////////////////////////////////////////////////////////////////////////

+

+#ifndef _MSC_VER // [

+#error "Use this header only with Microsoft Visual C++ compilers!"

+#endif // _MSC_VER ]

+

+#ifndef _MSC_INTTYPES_H_ // [

+#define _MSC_INTTYPES_H_

+

+#if _MSC_VER > 1000

+#pragma once

+#endif

+

+#include "stdint.h"

+

+// 7.8 Format conversion of integer types

+

+typedef struct {

+   intmax_t quot;

+   intmax_t rem;

+} imaxdiv_t;

+

+// 7.8.1 Macros for format specifiers

+

+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198

+

+// The fprintf macros for signed integers are:

+#define PRId8       "d"

+#define PRIi8       "i"

+#define PRIdLEAST8  "d"

+#define PRIiLEAST8  "i"

+#define PRIdFAST8   "d"

+#define PRIiFAST8   "i"

+

+#define PRId16       "hd"

+#define PRIi16       "hi"

+#define PRIdLEAST16  "hd"

+#define PRIiLEAST16  "hi"

+#define PRIdFAST16   "hd"

+#define PRIiFAST16   "hi"

+

+#define PRId32       "I32d"

+#define PRIi32       "I32i"

+#define PRIdLEAST32  "I32d"

+#define PRIiLEAST32  "I32i"

+#define PRIdFAST32   "I32d"

+#define PRIiFAST32   "I32i"

+

+#define PRId64       "I64d"

+#define PRIi64       "I64i"

+#define PRIdLEAST64  "I64d"

+#define PRIiLEAST64  "I64i"

+#define PRIdFAST64   "I64d"

+#define PRIiFAST64   "I64i"

+

+#define PRIdMAX     "I64d"

+#define PRIiMAX     "I64i"

+

+#define PRIdPTR     "Id"

+#define PRIiPTR     "Ii"

+

+// The fprintf macros for unsigned integers are:

+#define PRIo8       "o"

+#define PRIu8       "u"

+#define PRIx8       "x"

+#define PRIX8       "X"

+#define PRIoLEAST8  "o"

+#define PRIuLEAST8  "u"

+#define PRIxLEAST8  "x"

+#define PRIXLEAST8  "X"

+#define PRIoFAST8   "o"

+#define PRIuFAST8   "u"

+#define PRIxFAST8   "x"

+#define PRIXFAST8   "X"

+

+#define PRIo16       "ho"

+#define PRIu16       "hu"

+#define PRIx16       "hx"

+#define PRIX16       "hX"

+#define PRIoLEAST16  "ho"

+#define PRIuLEAST16  "hu"

+#define PRIxLEAST16  "hx"

+#define PRIXLEAST16  "hX"

+#define PRIoFAST16   "ho"

+#define PRIuFAST16   "hu"

+#define PRIxFAST16   "hx"

+#define PRIXFAST16   "hX"

+

+#define PRIo32       "I32o"

+#define PRIu32       "I32u"

+#define PRIx32       "I32x"

+#define PRIX32       "I32X"

+#define PRIoLEAST32  "I32o"

+#define PRIuLEAST32  "I32u"

+#define PRIxLEAST32  "I32x"

+#define PRIXLEAST32  "I32X"

+#define PRIoFAST32   "I32o"

+#define PRIuFAST32   "I32u"

+#define PRIxFAST32   "I32x"

+#define PRIXFAST32   "I32X"

+

+#define PRIo64       "I64o"

+#define PRIu64       "I64u"

+#define PRIx64       "I64x"

+#define PRIX64       "I64X"

+#define PRIoLEAST64  "I64o"

+#define PRIuLEAST64  "I64u"

+#define PRIxLEAST64  "I64x"

+#define PRIXLEAST64  "I64X"

+#define PRIoFAST64   "I64o"

+#define PRIuFAST64   "I64u"

+#define PRIxFAST64   "I64x"

+#define PRIXFAST64   "I64X"

+

+#define PRIoMAX     "I64o"

+#define PRIuMAX     "I64u"

+#define PRIxMAX     "I64x"

+#define PRIXMAX     "I64X"

+

+#define PRIoPTR     "Io"

+#define PRIuPTR     "Iu"

+#define PRIxPTR     "Ix"

+#define PRIXPTR     "IX"

+

+// The fscanf macros for signed integers are:

+#define SCNd8       "d"

+#define SCNi8       "i"

+#define SCNdLEAST8  "d"

+#define SCNiLEAST8  "i"

+#define SCNdFAST8   "d"

+#define SCNiFAST8   "i"

+

+#define SCNd16       "hd"

+#define SCNi16       "hi"

+#define SCNdLEAST16  "hd"

+#define SCNiLEAST16  "hi"

+#define SCNdFAST16   "hd"

+#define SCNiFAST16   "hi"

+

+#define SCNd32       "ld"

+#define SCNi32       "li"

+#define SCNdLEAST32  "ld"

+#define SCNiLEAST32  "li"

+#define SCNdFAST32   "ld"

+#define SCNiFAST32   "li"

+

+#define SCNd64       "I64d"

+#define SCNi64       "I64i"

+#define SCNdLEAST64  "I64d"

+#define SCNiLEAST64  "I64i"

+#define SCNdFAST64   "I64d"

+#define SCNiFAST64   "I64i"

+

+#define SCNdMAX     "I64d"

+#define SCNiMAX     "I64i"

+

+#ifdef _WIN64 // [

+#  define SCNdPTR     "I64d"

+#  define SCNiPTR     "I64i"

+#else  // _WIN64 ][

+#  define SCNdPTR     "ld"

+#  define SCNiPTR     "li"

+#endif  // _WIN64 ]

+

+// The fscanf macros for unsigned integers are:

+#define SCNo8       "o"

+#define SCNu8       "u"

+#define SCNx8       "x"

+#define SCNX8       "X"

+#define SCNoLEAST8  "o"

+#define SCNuLEAST8  "u"

+#define SCNxLEAST8  "x"

+#define SCNXLEAST8  "X"

+#define SCNoFAST8   "o"

+#define SCNuFAST8   "u"

+#define SCNxFAST8   "x"

+#define SCNXFAST8   "X"

+

+#define SCNo16       "ho"

+#define SCNu16       "hu"

+#define SCNx16       "hx"

+#define SCNX16       "hX"

+#define SCNoLEAST16  "ho"

+#define SCNuLEAST16  "hu"

+#define SCNxLEAST16  "hx"

+#define SCNXLEAST16  "hX"

+#define SCNoFAST16   "ho"

+#define SCNuFAST16   "hu"

+#define SCNxFAST16   "hx"

+#define SCNXFAST16   "hX"

+

+#define SCNo32       "lo"

+#define SCNu32       "lu"

+#define SCNx32       "lx"

+#define SCNX32       "lX"

+#define SCNoLEAST32  "lo"

+#define SCNuLEAST32  "lu"

+#define SCNxLEAST32  "lx"

+#define SCNXLEAST32  "lX"

+#define SCNoFAST32   "lo"

+#define SCNuFAST32   "lu"

+#define SCNxFAST32   "lx"

+#define SCNXFAST32   "lX"

+

+#define SCNo64       "I64o"

+#define SCNu64       "I64u"

+#define SCNx64       "I64x"

+#define SCNX64       "I64X"

+#define SCNoLEAST64  "I64o"

+#define SCNuLEAST64  "I64u"

+#define SCNxLEAST64  "I64x"

+#define SCNXLEAST64  "I64X"

+#define SCNoFAST64   "I64o"

+#define SCNuFAST64   "I64u"

+#define SCNxFAST64   "I64x"

+#define SCNXFAST64   "I64X"

+

+#define SCNoMAX     "I64o"

+#define SCNuMAX     "I64u"

+#define SCNxMAX     "I64x"

+#define SCNXMAX     "I64X"

+

+#ifdef _WIN64 // [

+#  define SCNoPTR     "I64o"

+#  define SCNuPTR     "I64u"

+#  define SCNxPTR     "I64x"

+#  define SCNXPTR     "I64X"

+#else  // _WIN64 ][

+#  define SCNoPTR     "lo"

+#  define SCNuPTR     "lu"

+#  define SCNxPTR     "lx"

+#  define SCNXPTR     "lX"

+#endif  // _WIN64 ]

+

+#endif // __STDC_FORMAT_MACROS ]

+

+// 7.8.2 Functions for greatest-width integer types

+

+// 7.8.2.1 The imaxabs function

+#define imaxabs _abs64

+

+// 7.8.2.2 The imaxdiv function

+

+// This is modified version of div() function from Microsoft's div.c found

+// in %MSVC.NET%\crt\src\div.c

+#ifdef STATIC_IMAXDIV // [

+static

+#else // STATIC_IMAXDIV ][

+_inline

+#endif // STATIC_IMAXDIV ]

+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)

+{

+   imaxdiv_t result;

+

+   result.quot = numer / denom;

+   result.rem = numer % denom;

+

+   if (numer < 0 && result.rem > 0) {

+      // did division wrong; must fix up

+      ++result.quot;

+      result.rem -= denom;

+   }

+

+   return result;

+}

+

+// 7.8.2.3 The strtoimax and strtoumax functions

+#define strtoimax _strtoi64

+#define strtoumax _strtoui64

+

+// 7.8.2.4 The wcstoimax and wcstoumax functions

+#define wcstoimax _wcstoi64

+#define wcstoumax _wcstoui64

+

+

+#endif // _MSC_INTTYPES_H_ ]

diff --git a/include/stdbool.h b/include/stdbool.h
index 111b8f2a9..24cf1c038 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,8 +1,46 @@
-#ifndef __STDBOOL_H__

-#define __STDBOOL_H__

+/**************************************************************************

+ *

+ * Copyright 2007-2010 VMware, Inc.

+ * All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,

+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+ * USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ *

+ **************************************************************************/

 

-typedef int bool;

-#define false 0

-#define true 1

+#ifndef _STDBOOL_H_

+#define _STDBOOL_H_

+

+#ifndef __cplusplus

+

+#define false   0

+#define true    1

+#define bool    _Bool

+

+/* For compilers that don't have the builtin _Bool type. */

+#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)

+typedef unsigned char _Bool;

 #endif

 

+#endif /* !__cplusplus */

+

+#define __bool_true_false_are_defined   1

+

+#endif /* !_STDBOOL_H_ */

diff --git a/include/stdint.h b/include/stdint.h
index c5ef47ae3..59d067302 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -1,177 +1,247 @@
-/* stdint.h - integer types
-
-   Copyright 2003, 2006, 2007 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#include <sys/types.h>
-
-/* Exact-width integer types */
-
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-#endif
-
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-
-/* Minimum-width integer types */
-
-typedef signed char int_least8_t;
-typedef short int_least16_t;
-typedef long int_least32_t;
-typedef __int64 int_least64_t;
-
-typedef unsigned char uint_least8_t;
-typedef unsigned short uint_least16_t;
-typedef unsigned long uint_least32_t;
-typedef unsigned __int64 uint_least64_t;
-
-/* Fastest minimum-width integer types */
-
-typedef signed char int_fast8_t;
-typedef long int_fast16_t;
-typedef long int_fast32_t;
-typedef long long int_fast64_t;
-
-typedef unsigned char uint_fast8_t;
-typedef unsigned long uint_fast16_t;
-typedef unsigned long uint_fast32_t;
-typedef unsigned __int64 uint_fast64_t;
-
-typedef unsigned __int64 uint64_t;
-typedef int ssize_t;
-
-/* Integer types capable of holding object pointers */
-
-/* Greatest-width integer types */
-
-typedef long long intmax_t;
-typedef unsigned long long uintmax_t;
-
-/* Limits of exact-width integer types */
-
-#define INT8_MIN (-128)
-#define INT16_MIN (-32768)
-#define INT32_MIN (-2147483647 - 1)
-#define INT64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT8_MAX (127)
-#define INT16_MAX (32767)
-#define INT32_MAX (2147483647)
-#define INT64_MAX (9223372036854775807LL)
-
-#define UINT8_MAX (255)
-#define UINT16_MAX (65535)
-#define UINT32_MAX (4294967295UL)
-#define UINT64_MAX (18446744073709551615ULL)
-
-/* Limits of minimum-width integer types */
-
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST32_MIN (-2147483647 - 1)
-#define INT_LEAST64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT_LEAST8_MAX (127)
-#define INT_LEAST16_MAX (32767)
-#define INT_LEAST32_MAX (2147483647)
-#define INT_LEAST64_MAX (9223372036854775807LL)
-
-#define UINT_LEAST8_MAX (255)
-#define UINT_LEAST16_MAX (65535)
-#define UINT_LEAST32_MAX (4294967295UL)
-#define UINT_LEAST64_MAX (18446744073709551615ULL)
-
-/* Limits of fastest minimum-width integer types */
-
-#define INT_FAST8_MIN (-128)
-#define INT_FAST16_MIN (-2147483647 - 1)
-#define INT_FAST32_MIN (-2147483647 - 1)
-#define INT_FAST64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT_FAST8_MAX (127)
-#define INT_FAST16_MAX (2147483647)
-#define INT_FAST32_MAX (2147483647)
-#define INT_FAST64_MAX (9223372036854775807LL)
-
-#define UINT_FAST8_MAX (255)
-#define UINT_FAST16_MAX (4294967295UL)
-#define UINT_FAST32_MAX (4294967295UL)
-#define UINT_FAST64_MAX (18446744073709551615ULL)
-
-/* Limits of integer types capable of holding object pointers */
-
-#define INTPTR_MIN (-2147483647 - 1)
-#define INTPTR_MAX (2147483647)
-#define UINTPTR_MAX (4294967295UL)
-
-/* Limits of greatest-width integer types */
-
-#define INTMAX_MIN (-9223372036854775807LL - 1LL)
-#define INTMAX_MAX (9223372036854775807LL)
-#define UINTMAX_MAX (18446744073709551615ULL)
-
-/* Limits of other integer types */
-
-#ifndef PTRDIFF_MIN
-#define PTRDIFF_MIN (-2147483647 - 1)
-#define PTRDIFF_MAX (2147483647)
-#endif
-
-#ifndef SIG_ATOMIC_MIN
-#define SIG_ATOMIC_MIN (-2147483647 - 1)
-#endif
-#ifndef SIG_ATOMIC_MAX
-#define SIG_ATOMIC_MAX (2147483647)
-#endif
-
-#ifndef SIZE_MAX
-#define SIZE_MAX (4294967295UL)
-#endif
-
-#ifndef WCHAR_MIN
-#ifdef __WCHAR_MIN__
-#define WCHAR_MIN __WCHAR_MIN__
-#define WCHAR_MAX __WCHAR_MAX__
-#else
-#define WCHAR_MIN (0)
-#define WCHAR_MAX (65535)
-#endif
-#endif
-
-#ifndef WINT_MIN
-#define WINT_MIN 0U
-#define WINT_MAX UINT_MAX
-#endif
-
-/* Macros for minimum-width integer constant expressions */
-
-#define INT8_C(x) x
-#define INT16_C(x) x
-#define INT32_C(x) x ## L
-#define INT64_C(__val) __val##i64

-
-#define UINT8_C(x) x
-#define UINT16_C(x) x
-#define UINT32_C(x) x ## UL
-#define UINT64_C(__val) __val##ui64

-
-/* Macros for greatest-width integer constant expressions */
-
-#define INTMAX_C(x) x ## LL
-#define UINTMAX_C(x) x ## ULL
-
-#endif /* _STDINT_H */
+// 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

+// 

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are met:

+// 

+//   1. Redistributions of source code must retain the above copyright notice,

+//      this list of conditions and the following disclaimer.

+// 

+//   2. Redistributions in binary form must reproduce the above copyright

+//      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.

+// 

+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;

+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 

+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+// 

+///////////////////////////////////////////////////////////////////////////////

+

+#ifndef _MSC_VER // [

+#error "Use this header only with Microsoft Visual C++ compilers!"

+#endif // _MSC_VER ]

+

+#ifndef _MSC_STDINT_H_ // [

+#define _MSC_STDINT_H_

+

+#if _MSC_VER > 1000

+#pragma once

+#endif

+

+#include <limits.h>

+

+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when

+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'

+// or compiler give many errors like this:

+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed

+#ifdef __cplusplus

+extern "C" {

+#endif

+#  include <wchar.h>

+#ifdef __cplusplus

+}

+#endif

+

+// Define _W64 macros to mark types changing their size, like intptr_t.

+#ifndef _W64

+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300

+#     define _W64 __w64

+#  else

+#     define _W64

+#  endif

+#endif

+

+

+// 7.18.1 Integer types

+

+// 7.18.1.1 Exact-width integer types

+

+// Visual Studio 6 and Embedded Visual C++ 4 doesn't

+// realize that, e.g. char has the same size as __int8

+// so we give up on __intX for them.

+#if (_MSC_VER < 1300)

+   typedef signed char       int8_t;

+   typedef signed short      int16_t;

+   typedef signed int        int32_t;

+   typedef unsigned char     uint8_t;

+   typedef unsigned short    uint16_t;

+   typedef unsigned int      uint32_t;

+#else

+   typedef signed __int8     int8_t;

+   typedef signed __int16    int16_t;

+   typedef signed __int32    int32_t;

+   typedef unsigned __int8   uint8_t;

+   typedef unsigned __int16  uint16_t;

+   typedef unsigned __int32  uint32_t;

+#endif

+typedef signed __int64       int64_t;

+typedef unsigned __int64     uint64_t;

+

+

+// 7.18.1.2 Minimum-width integer types

+typedef int8_t    int_least8_t;

+typedef int16_t   int_least16_t;

+typedef int32_t   int_least32_t;

+typedef int64_t   int_least64_t;

+typedef uint8_t   uint_least8_t;

+typedef uint16_t  uint_least16_t;

+typedef uint32_t  uint_least32_t;

+typedef uint64_t  uint_least64_t;

+

+// 7.18.1.3 Fastest minimum-width integer types

+typedef int8_t    int_fast8_t;

+typedef int16_t   int_fast16_t;

+typedef int32_t   int_fast32_t;

+typedef int64_t   int_fast64_t;

+typedef uint8_t   uint_fast8_t;

+typedef uint16_t  uint_fast16_t;

+typedef uint32_t  uint_fast32_t;

+typedef uint64_t  uint_fast64_t;

+

+// 7.18.1.4 Integer types capable of holding object pointers

+#ifdef _WIN64 // [

+   typedef signed __int64    intptr_t;

+   typedef unsigned __int64  uintptr_t;

+#else // _WIN64 ][

+   typedef _W64 signed int   intptr_t;

+   typedef _W64 unsigned int uintptr_t;

+#endif // _WIN64 ]

+

+// 7.18.1.5 Greatest-width integer types

+typedef int64_t   intmax_t;

+typedef uint64_t  uintmax_t;

+

+

+// 7.18.2 Limits of specified-width integer types

+

+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259

+

+// 7.18.2.1 Limits of exact-width integer types

+#define INT8_MIN     ((int8_t)_I8_MIN)

+#define INT8_MAX     _I8_MAX

+#define INT16_MIN    ((int16_t)_I16_MIN)

+#define INT16_MAX    _I16_MAX

+#define INT32_MIN    ((int32_t)_I32_MIN)

+#define INT32_MAX    _I32_MAX

+#define INT64_MIN    ((int64_t)_I64_MIN)

+#define INT64_MAX    _I64_MAX

+#define UINT8_MAX    _UI8_MAX

+#define UINT16_MAX   _UI16_MAX

+#define UINT32_MAX   _UI32_MAX

+#define UINT64_MAX   _UI64_MAX

+

+// 7.18.2.2 Limits of minimum-width integer types

+#define INT_LEAST8_MIN    INT8_MIN

+#define INT_LEAST8_MAX    INT8_MAX

+#define INT_LEAST16_MIN   INT16_MIN

+#define INT_LEAST16_MAX   INT16_MAX

+#define INT_LEAST32_MIN   INT32_MIN

+#define INT_LEAST32_MAX   INT32_MAX

+#define INT_LEAST64_MIN   INT64_MIN

+#define INT_LEAST64_MAX   INT64_MAX

+#define UINT_LEAST8_MAX   UINT8_MAX

+#define UINT_LEAST16_MAX  UINT16_MAX

+#define UINT_LEAST32_MAX  UINT32_MAX

+#define UINT_LEAST64_MAX  UINT64_MAX

+

+// 7.18.2.3 Limits of fastest minimum-width integer types

+#define INT_FAST8_MIN    INT8_MIN

+#define INT_FAST8_MAX    INT8_MAX

+#define INT_FAST16_MIN   INT16_MIN

+#define INT_FAST16_MAX   INT16_MAX

+#define INT_FAST32_MIN   INT32_MIN

+#define INT_FAST32_MAX   INT32_MAX

+#define INT_FAST64_MIN   INT64_MIN

+#define INT_FAST64_MAX   INT64_MAX

+#define UINT_FAST8_MAX   UINT8_MAX

+#define UINT_FAST16_MAX  UINT16_MAX

+#define UINT_FAST32_MAX  UINT32_MAX

+#define UINT_FAST64_MAX  UINT64_MAX

+

+// 7.18.2.4 Limits of integer types capable of holding object pointers

+#ifdef _WIN64 // [

+#  define INTPTR_MIN   INT64_MIN

+#  define INTPTR_MAX   INT64_MAX

+#  define UINTPTR_MAX  UINT64_MAX

+#else // _WIN64 ][

+#  define INTPTR_MIN   INT32_MIN

+#  define INTPTR_MAX   INT32_MAX

+#  define UINTPTR_MAX  UINT32_MAX

+#endif // _WIN64 ]

+

+// 7.18.2.5 Limits of greatest-width integer types

+#define INTMAX_MIN   INT64_MIN

+#define INTMAX_MAX   INT64_MAX

+#define UINTMAX_MAX  UINT64_MAX

+

+// 7.18.3 Limits of other integer types

+

+#ifdef _WIN64 // [

+#  define PTRDIFF_MIN  _I64_MIN

+#  define PTRDIFF_MAX  _I64_MAX

+#else  // _WIN64 ][

+#  define PTRDIFF_MIN  _I32_MIN

+#  define PTRDIFF_MAX  _I32_MAX

+#endif  // _WIN64 ]

+

+#define SIG_ATOMIC_MIN  INT_MIN

+#define SIG_ATOMIC_MAX  INT_MAX

+

+#ifndef SIZE_MAX // [

+#  ifdef _WIN64 // [

+#     define SIZE_MAX  _UI64_MAX

+#  else // _WIN64 ][

+#     define SIZE_MAX  _UI32_MAX

+#  endif // _WIN64 ]

+#endif // SIZE_MAX ]

+

+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>

+#ifndef WCHAR_MIN // [

+#  define WCHAR_MIN  0

+#endif  // WCHAR_MIN ]

+#ifndef WCHAR_MAX // [

+#  define WCHAR_MAX  _UI16_MAX

+#endif  // WCHAR_MAX ]

+

+#define WINT_MIN  0

+#define WINT_MAX  _UI16_MAX

+

+#endif // __STDC_LIMIT_MACROS ]

+

+

+// 7.18.4 Limits of other integer types

+

+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260

+

+// 7.18.4.1 Macros for minimum-width integer constants

+

+#define INT8_C(val)  val##i8

+#define INT16_C(val) val##i16

+#define INT32_C(val) val##i32

+#define INT64_C(val) val##i64

+

+#define UINT8_C(val)  val##ui8

+#define UINT16_C(val) val##ui16

+#define UINT32_C(val) val##ui32

+#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

+

+#endif // __STDC_CONSTANT_MACROS ]

+

+

+#endif // _MSC_STDINT_H_ ]

diff --git a/mesalib/docs/relnotes-7.10.html b/mesalib/docs/relnotes-7.10.html
new file mode 100644
index 000000000..872ce4730
--- /dev/null
+++ b/mesalib/docs/relnotes-7.10.html
@@ -0,0 +1,56 @@
+<HTML>

+

+<TITLE>Mesa Release Notes</TITLE>

+

+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<body bgcolor="#eeeeee">

+

+<H1>Mesa 7.10 Release Notes / tbd</H1>

+

+<p>

+Mesa 7.10 is a new development release.

+People who are concerned with stability and reliability should stick

+with a previous release or wait for Mesa 7.10.1.

+</p>

+<p>

+Mesa 7.10 implements the OpenGL 2.1 API, but the version reported by

+glGetString(GL_VERSION) depends on the particular driver being used.

+Some drivers don't support all the features required in OpenGL 2.1.

+</p>

+<p>

+See the <a href="install.html">Compiling/Installing page</a> for prerequisites

+for DRI hardware acceleration.

+</p>

+

+

+<h2>MD5 checksums</h2>

+<pre>

+tbd

+</pre>

+

+

+<h2>New features</h2>

+<ul>

+<li>GL_ARB_explicit_attrib_location extension (Intel and software drivers).

+<li>GL_ARB_texture_rg (Intel, software drivers, gallium drivers).

+<li>GL_EXT_separate_shader_objects extension (Intel and software drivers).

+<li>GL_NV_primitive_restart extension (Gallium softpipe, llvmpipe).

+</ul>

+

+

+<h2>Bug fixes</h2>

+<ul>

+<li>tbd</li>

+</ul>

+

+

+<h2>Changes</h2>

+<ul>

+<li>Upgraded glext.h to version 66</li>

+</ul>

+

+</body>

+</html>

diff --git a/mesalib/docs/relnotes-7.8.3.html b/mesalib/docs/relnotes-7.8.3.html
new file mode 100644
index 000000000..e729ee820
--- /dev/null
+++ b/mesalib/docs/relnotes-7.8.3.html
@@ -0,0 +1,89 @@
+<HTML>

+

+<TITLE>Mesa Release Notes</TITLE>

+

+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<body bgcolor="#eeeeee">

+

+<H1>Mesa 7.8.3 Release Notes / (date tbd)</H1>

+

+<p>

+Mesa 7.8.3 is a bug fix release which fixes bugs found since the 7.8.2 release.

+</p>

+<p>

+Mesa 7.8.3 implements the OpenGL 2.1 API, but the version reported by

+glGetString(GL_VERSION) depends on the particular driver being used.

+Some drivers don't support all the features required in OpenGL 2.1.

+</p>

+<p>

+See the <a href="install.html">Compiling/Installing page</a> for prerequisites

+for DRI hardware acceleration.

+</p>

+

+

+<h2>MD5 checksums</h2>

+<pre>

+x  MesaLib-7.8.3.tar.gz

+x  MesaLib-7.8.3.tar.bz2

+x  MesaLib-7.8.3.zip

+x  MesaDemos-7.8.3.tar.gz

+x  MesaDemos-7.8.3.tar.bz2

+x  MesaDemos-7.8.3.zip

+x  MesaGLUT-7.8.3.tar.gz

+x  MesaGLUT-7.8.3.tar.bz2

+x  MesaGLUT-7.8.3.zip

+</pre>

+

+

+<h2>New features</h2>

+<p>None.</p>

+

+

+<h2>Changes</h2>

+<ul>

+<li>The radeon driver should use less memory when searching for a valid mip

+image.</li>

+</ul>

+

+

+<h2>Bug fixes</h2>

+<ul>

+<li>Fix unsupported FB with D24S8 (bug 

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=23670">29116</a>)</li>

+<li>Fix ReadPixels crash when reading depth/stencil from an FBO</li>

+<li>Fixed a bug rendering to 16-bit buffers using swrast.</li>

+<li>Fixed a state tracker/TGSI bug that caused crashes when using Windows'

+    memory debugging features.</li>

+<li>Fixed an issue rendering to 32-bit channels with swrast (bug

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=29487">29487</a>)</li>

+<li>GLSL: fix indirect <TT>gl_TextureMatrix</TT> addressing (bug

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=28967">28967</a>)</li>

+<li>GLSL: fix for bug

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27216">27216</a></li>

+<li>GLSL: fix zw fragcoord entries in some cases (bug

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=29183">29183</a>)</li>

+<li>Fix texture env generation in some cases (bug

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=28169">28169</a>)</li>

+<li>osmesa: a fix for calling <TT>OSMesaMakeCurrent</TT> twice was applied (bug 

+    <a href="https://bugs.freedesktop.org/show_bug.cgi?id=10966">10966</a></li>

+<li>A bug was fixed which could cause Mesa to ignore the

+    <TT>MESA_EXTENSION_OVERRIDE</TT> environment variable.</li>

+<li>A bug related to specular highlights on backfaces was fixed.</li>

+<li>A radeon-specific issue with <TT>glCopyTex(Sub)Image</TT> was

+    corrected.</li>

+<li>radeon/wine: flush command stream in more cases, fixing wine d3d9

+    tests.</li>

+<li>r600: fix sin+cos normalization.</li>

+<li>r600: (properly) ignore <TT>GL_COORD_REPLACE</TT> when point sprites are

+    disabled.</li>

+<li>radeon: avoid flushing when the context is not current.</li>

+<li>r300c: a bug affecting unaligned BOs was fixed.</li>

+<li>r300c: a hardlock caused by ARB_half_float_vertex incorrectly advertised on some chipsets.</li>

+</ul>

+

+

+</body>

+</html>

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 0bd312154..8373b8ee5 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1528,6 +1528,9 @@ st_copy_texsubimage(struct gl_context *ctx,
    if (texBaseFormat == GL_DEPTH_COMPONENT ||

        texBaseFormat == GL_DEPTH_STENCIL) {

       strb = st_renderbuffer(fb->_DepthBuffer);

+      if (strb->Base.Wrapped) {

+         strb = st_renderbuffer(strb->Base.Wrapped);

+      }

    }

    else {

       /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */

diff --git a/mesalib/src/mesa/tnl/t_vertex.h b/mesalib/src/mesa/tnl/t_vertex.h
index 580961037..bdbc88aff 100644
--- a/mesalib/src/mesa/tnl/t_vertex.h
+++ b/mesalib/src/mesa/tnl/t_vertex.h
@@ -28,9 +28,12 @@
 #ifndef _TNL_VERTEX_H

 #define _TNL_VERTEX_H

 

-#include "main/mtypes.h"

+#include "main/glheader.h"

 #include "t_context.h"

 

+struct gl_context;

+struct tnl_clipspace;

+

 /* New mechanism to specify hardware vertices so that tnl can build

  * and manipulate them directly.  

  */

diff --git a/mesalib/src/mesa/tnl/t_vp_build.c b/mesalib/src/mesa/tnl/t_vp_build.c
index d0bada3bc..913cba676 100644
--- a/mesalib/src/mesa/tnl/t_vp_build.c
+++ b/mesalib/src/mesa/tnl/t_vp_build.c
@@ -32,7 +32,7 @@
 

 #include "main/glheader.h"

 #include "main/ffvertex_prog.h"

-#include "main/dd.h"

+#include "main/mtypes.h"

 #include "t_vp_build.h"

 

 

diff --git a/mesalib/src/mesa/tnl/t_vp_build.h b/mesalib/src/mesa/tnl/t_vp_build.h
index e5133e052..6cba2ce5a 100644
--- a/mesalib/src/mesa/tnl/t_vp_build.h
+++ b/mesalib/src/mesa/tnl/t_vp_build.h
@@ -27,7 +27,7 @@
 #ifndef T_VP_BUILD_H

 #define T_VP_BUILD_H

 

-#include "main/mtypes.h"

+struct gl_context;

 

 #define TNL_FIXED_FUNCTION_STATE_FLAGS (_NEW_PROGRAM |		\

 					_NEW_LIGHT |		\

diff --git a/mesalib/src/mesa/tnl/tnl.h b/mesalib/src/mesa/tnl/tnl.h
index 9966878da..3ca0c5ebb 100644
--- a/mesalib/src/mesa/tnl/tnl.h
+++ b/mesalib/src/mesa/tnl/tnl.h
@@ -28,8 +28,11 @@
 #ifndef _TNL_H

 #define _TNL_H

 

-#include "main/mtypes.h"

+#include "main/glheader.h"

 

+struct gl_client_array;

+struct gl_context;

+struct gl_program;

 

 

 /* These are the public-access functions exported from tnl.  (A few

diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index 3575aa749..20c7429da 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -32,7 +32,10 @@
 #ifndef _VBO_H

 #define _VBO_H

 

-#include "main/mtypes.h"

+#include "main/glheader.h"

+

+struct gl_client_array;

+struct gl_context;

 

 struct _mesa_prim {

    GLuint mode:8;

diff --git a/mesalib/src/mesa/x86/mmx.h b/mesalib/src/mesa/x86/mmx.h
index c1bda5909..28a43d18d 100644
--- a/mesalib/src/mesa/x86/mmx.h
+++ b/mesalib/src/mesa/x86/mmx.h
@@ -27,7 +27,9 @@
 #define ASM_MMX_H

 

 #include "main/compiler.h"

-#include "main/mtypes.h"

+#include "main/glheader.h"

+

+struct gl_context;

 

 extern void _ASMAPI

 _mesa_mmx_blend_transparency( struct gl_context *ctx, GLuint n, const GLubyte mask[],