* cygwin.din: Export wcstoimax, wcstoumax.

	* posix.sgml: Move wcstoimax and wcstoumax to SUSv4 section.
	* include/inttypes.h: Declare wcstoimax and wcstoumax.
	* include/cygwin/version.h: Bump API minor number.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 470afee..35f4678 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-16  Corinna Vinschen  <corinna@vinschen.de>
+
+       * cygwin.din: Export wcstoimax, wcstoumax.
+       * posix.sgml: Move wcstoimax and wcstoumax to SUSv4 section.
+       * include/inttypes.h: Declare wcstoimax and wcstoumax.
+       * include/cygwin/version.h: Bump API minor number.
+
 2009-02-13  Corinna Vinschen  <corinna@vinschen.de>
 
        * cygwin.din: Export wcsnlen.

diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index a9f4a50..f38738f 100644 (file)
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -1746,15 +1746,17 @@ wcsrchr NOSIGFE
 wcsrtombs NOSIGFE
 wcsspn NOSIGFE
 wcsstr NOSIGFE
-wcstok NOSIGFE
 wcstod NOSIGFE
 wcstof NOSIGFE
+wcstoimax = wcstoll NOSIGFE
+wcstok NOSIGFE
 wcstol NOSIGFE
 wcstoll NOSIGFE
 wcstombs NOSIGFE
 _wcstombs = wcstombs NOSIGFE
 wcstoul NOSIGFE
 wcstoull NOSIGFE
+wcstoumax = wcstoull NOSIGFE
 wcswidth NOSIGFE
 wcsxfrm NOSIGFE
 wctob NOSIGFE

diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 4e411b2..b442770 100644 (file)
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -345,12 +345,13 @@ details. */
       194: fcntl.h flags O_DIRECTORY, O_EXEC and O_SEARCH added.
       195: Export wcstod, wcstof.
       196: Export wcsnlen.
+      197: Export wcstoimax, wcstoumax.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 196
+#define CYGWIN_VERSION_API_MINOR 197
 
      /* There is also a compatibity version number associated with the
        shared memory regions.  It is incremented when incompatible

diff --git a/winsup/cygwin/include/inttypes.h b/winsup/cygwin/include/inttypes.h
index beacba6..5cc31eb 100644 (file)
--- a/winsup/cygwin/include/inttypes.h
+++ b/winsup/cygwin/include/inttypes.h
@@ -1,6 +1,6 @@
 /* inttypes.h - fixed size integer types
 
-   Copyright 2003 Red Hat, Inc.
+   Copyright 2003, 2009 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -12,6 +12,8 @@ details. */
 #define _INTTYPES_H
 
 #include <stdint.h>
+#define __need_wchar_t
+#include <stddef.h>
 
 /* fprintf() macros for signed integers */
 
@@ -234,11 +236,8 @@ 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));
-
-#if 0 /* Not yet defined */
 intmax_t _EXFUN(wcstoimax, (const wchar_t *, wchar_t **, int));
 uintmax_t _EXFUN(wcstoumax, (const wchar_t *, wchar_t **, int));
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/winsup/cygwin/posix.sgml b/winsup/cygwin/posix.sgml
index 4b5f714..d2a5100 100644 (file)
--- a/winsup/cygwin/posix.sgml
+++ b/winsup/cygwin/posix.sgml
@@ -827,12 +827,14 @@ also IEEE Std 1003.1-2008 (POSIX.1-2008).</para>
     wcsstr
     wcstod
     wcstof
+    wcstoimax
     wcstok
     wcstol
     wcstoll
     wcstombs
     wcstoul
     wcstoull
+    wcstoumax
     wcswidth
     wcsxfrm
     wctob
@@ -1338,9 +1340,7 @@ also IEEE Std 1003.1-2008 (POSIX.1-2008).</para>
     wcsncasecmp
     wcsncasecmp_l
     wcsnrtombs
-    wcstoimax
     wcstold
-    wcstoumax
     wcsxfrm_l
     wctrans_l
     wctype_l