* 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.

2 files changed, 5 insertions, 5 deletions

diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 4e411b2f9..b442770e2 100644
--- 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 beacba620..5cc31eb47 100644
--- 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
 }