From d7f6167e028d20ea592328a602ff3314b32f64a8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 8 Apr 2014 23:47:22 +0100 Subject: [PATCH] Remove duplicate declarations of strtoimax and strtoumax in inttypes.i --- CHANGES.current | 3 +++ Lib/inttypes.i | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index ea34b0c81..11682c9dd 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 3.0.1 (in progress) =========================== +2014-04-08: wsfulton + SF Bug #1366 - Remove duplicate declarations of strtoimax and strtoumax in inttypes.i + 2014-04-08: wsfulton [Java C#] Enums which have been ignored via %ignore and are subsequently used are handled slightly differently. Type wrapper classes are now generated diff --git a/Lib/inttypes.i b/Lib/inttypes.i index 8450cb840..85bd5adaf 100644 --- a/Lib/inttypes.i +++ b/Lib/inttypes.i @@ -41,12 +41,6 @@ extern "C" { /* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */ extern imaxdiv_t imaxdiv (intmax_t numer, intmax_t denom); - /* Like `strtol' but convert to `intmax_t'. */ - extern intmax_t strtoimax (const char *nptr, char **endptr, int base); - - /* Like `strtoul' but convert to `uintmax_t'. */ - extern uintmax_t strtoumax (const char *nptr, char ** endptr, int base); - #ifdef SWIG_WCHAR /* Like `wcstol' but convert to `intmax_t'. */ extern intmax_t wcstoimax (const wchar_t *nptr, wchar_t **endptr, int base); @@ -84,7 +78,7 @@ extern "C" { extern uintmax_t wcstoumax (const wchar_t *nptr, wchar_t **endptr, int base); #endif -#endif /* SWIGWORDSIZE32 */ +#endif /* SWIGWORDSIZE64 */ #ifdef __cplusplus }