solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove HAVE_STRTOULL and HAVE_WCSTOULL

Browse source 
We can assume these functions are always available now as they are part
of C++11.
This commit is contained in:
Vadim Zeitlin 2022-10-09 23:45:57 +02:00
parent 924db833f4
commit dd404fdd77
5 changed files with 6 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/cmake/setup.h.in
View file

@ -985,9 +985,6 @@
/* define if you have statvfs function */
#cmakedefine HAVE_STATVFS 1
/* Define if you have strtoull() and strtoll() */
#cmakedefine HAVE_STRTOULL 1
/* Define if you have all functions to set thread priority */
#cmakedefine HAVE_THREAD_PRIORITY_FUNCTIONS 1
@ -1029,9 +1026,6 @@
/* Define if you have wcsnlen() function */
#cmakedefine HAVE_WCSNLEN 1
/* Define if you have wcstoull() and wcstoll() */
#cmakedefine HAVE_WCSTOULL 1
/* The number of bytes in a wchar_t. */
@SIZEOF_WCHAR_T_CODE@

1
include/wx/osx/config_xcode.h
View file

@ -58,7 +58,6 @@
#define HAVE_STRNLEN 1
#define HAVE_STRPTIME 1
#define HAVE_STRPTIME_DECL 1
#define HAVE_STRTOULL 1
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
#define HAVE_VSNPRINTF 1
#define HAVE_VSSCANF 1

25
include/wx/wxcrtbase.h
View file

@ -179,26 +179,13 @@ extern unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int
#define wxCRT_StrtollW _wcstoi64
#define wxCRT_StrtoullW _wcstoui64
#else
/* Both of these functions are implemented in C++11 compilers */
#ifndef HAVE_STRTOULL
#define HAVE_STRTOULL
#endif
#ifndef HAVE_WCSTOULL
#define HAVE_WCSTOULL
#endif
wxDECL_FOR_STRICT_MINGW32(long long, strtoll, (const char*, char**, int))
wxDECL_FOR_STRICT_MINGW32(unsigned long long, strtoull, (const char*, char**, int))
#ifdef HAVE_STRTOULL
wxDECL_FOR_STRICT_MINGW32(long long, strtoll, (const char*, char**, int))
wxDECL_FOR_STRICT_MINGW32(unsigned long long, strtoull, (const char*, char**, int))
#define wxCRT_StrtollA strtoll
#define wxCRT_StrtoullA strtoull
#endif /* HAVE_STRTOULL */
#ifdef HAVE_WCSTOULL
/* assume that we have wcstoull(), which is also C99, too */
#define wxCRT_StrtollW wcstoll
#define wxCRT_StrtoullW wcstoull
#endif /* HAVE_WCSTOULL */
#define wxCRT_StrtollA strtoll
#define wxCRT_StrtoullA strtoull
#define wxCRT_StrtollW wcstoll
#define wxCRT_StrtoullW wcstoull
#endif
/*

6
setup.h.in
View file

@ -985,9 +985,6 @@
/* define if you have statvfs function */
#undef HAVE_STATVFS
/* Define if you have strtoull() and strtoll() */
#undef HAVE_STRTOULL
/* Define if you have all functions to set thread priority */
#undef HAVE_THREAD_PRIORITY_FUNCTIONS
@ -1029,9 +1026,6 @@
/* Define if you have wcsnlen() function */
#undef HAVE_WCSNLEN
/* Define if you have wcstoull() and wcstoll() */
#undef HAVE_WCSTOULL
/* The number of bytes in a wchar_t. */
#undef SIZEOF_WCHAR_T

6
setup.h_vms
View file

@ -1098,9 +1098,6 @@ typedef pid_t GPid;
/* define if you have statvfs function */
#undef HAVE_STATVFS
/* Define if you have strtoull() and strtoll() */
#define HAVE_STRTOULL 1
/* Define if you have all functions to set thread priority */
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
@ -1147,9 +1144,6 @@ typedef pid_t GPid;
/* Define if you have wcsnlen() function */
#undef HAVE_WCSNLEN
/* Define if you have wcstoull() and wcstoll() */
#undef HAVE_WCSTOULL
/* The number of bytes in a wchar_t. */
#define SIZEOF_WCHAR_T 4