jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate declarations of strtoimax and strtoumax in inttypes.i

Browse source
This commit is contained in:
William S Fulton 2014-04-08 23:47:22 +01:00
commit d7f6167e02
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.1 (in progress) 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 2014-04-08: wsfulton
[Java C#] Enums which have been ignored via %ignore and are subsequently [Java C#] Enums which have been ignored via %ignore and are subsequently
used are handled slightly differently. Type wrapper classes are now generated used are handled slightly differently. Type wrapper classes are now generated

8
Lib/inttypes.i
View file

@ -41,12 +41,6 @@ extern "C" {
/* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */ /* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */
extern imaxdiv_t imaxdiv (intmax_t numer, intmax_t 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 #ifdef SWIG_WCHAR
/* Like `wcstol' but convert to `intmax_t'. */ /* Like `wcstol' but convert to `intmax_t'. */
extern intmax_t wcstoimax (const wchar_t *nptr, wchar_t **endptr, int base); 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); extern uintmax_t wcstoumax (const wchar_t *nptr, wchar_t **endptr, int base);
#endif #endif
#endif /* SWIGWORDSIZE32 */ #endif /* SWIGWORDSIZE64 */
#ifdef __cplusplus #ifdef __cplusplus
} }