summaryrefslogtreecommitdiff
path: root/src/drivers/Unix/Fl_Unix_System_Driver.cxx
diff options
context:
space:
mode:
authorian.macarthur <ian.macarthur@leonardocompany.com>2022-03-23 11:19:24 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2022-03-23 19:46:35 +0100
commit29c6d6c679d873988581e878f395399a6c4bb369 (patch)
treeefa031c450d31385ddd98815b71d09feae23ba29 /src/drivers/Unix/Fl_Unix_System_Driver.cxx
parent54ecae9bda20ac0788525d793c8107c8de7dee40 (diff)
Remove vsscanf_l() call from Win32 driver (it appears to be a BSD-ism and unsupported by the MS tools) and rename several clocale specific methods from "name" to "vname" since they take a va_list not a variable list of arguments.
Diffstat (limited to 'src/drivers/Unix/Fl_Unix_System_Driver.cxx')
-rw-r--r--src/drivers/Unix/Fl_Unix_System_Driver.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.cxx b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
index d956f04b1..176ad9a07 100644
--- a/src/drivers/Unix/Fl_Unix_System_Driver.cxx
+++ b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
@@ -73,7 +73,7 @@ static locale_t c_locale = NULL;
#endif
-int Fl_Unix_System_Driver::clocale_printf(FILE *output, const char *format, va_list args) {
+int Fl_Unix_System_Driver::clocale_vprintf(FILE *output, const char *format, va_list args) {
#if defined(__linux__) && defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700
if (!c_locale)
c_locale = newlocale(LC_NUMERIC_MASK, "C", duplocale(LC_GLOBAL_LOCALE));
@@ -89,7 +89,7 @@ int Fl_Unix_System_Driver::clocale_printf(FILE *output, const char *format, va_l
return retval;
}
-int Fl_Unix_System_Driver::clocale_snprintf(char *output, size_t output_size, const char *format, va_list args) {
+int Fl_Unix_System_Driver::clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) {
#if defined(__linux__) && defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700
if (!c_locale)
c_locale = newlocale(LC_NUMERIC_MASK, "C", duplocale(LC_GLOBAL_LOCALE));
@@ -105,7 +105,7 @@ int Fl_Unix_System_Driver::clocale_snprintf(char *output, size_t output_size, co
return retval;
}
-int Fl_Unix_System_Driver::clocale_sscanf(const char *input, const char *format, va_list args) {
+int Fl_Unix_System_Driver::clocale_vsscanf(const char *input, const char *format, va_list args) {
#if defined(__linux__) && defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700
if (!c_locale)
c_locale = newlocale(LC_NUMERIC_MASK, "C", duplocale(LC_GLOBAL_LOCALE));