mirror of
https://github.com/mcneel/opennurbs.git
synced 2026-03-07 07:45:53 +08:00
Sync changes from upstream repository
This commit is contained in:
@@ -82,8 +82,8 @@ int ON_String::ScanBufferVargs(
|
||||
va_list args
|
||||
)
|
||||
{
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
if (nullptr == buffer || nullptr == format)
|
||||
return -1;
|
||||
return vsscanf(buffer, format, args);
|
||||
@@ -156,7 +156,7 @@ int ON_wString::ScanBufferVargs(
|
||||
if (nullptr == args)
|
||||
return -1;
|
||||
return swscanf_l(buffer, _c_locale, format, args);
|
||||
#elif defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
#elif defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
return swscanf(buffer, format, args);
|
||||
#else
|
||||
return swscanf(buffer, format, args);
|
||||
@@ -395,8 +395,8 @@ const char* ON_String::ToNumber(
|
||||
local_buffer[local_buffer_count++] = 0;
|
||||
|
||||
double x = value_on_failure;
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
if (1 == sscanf(local_buffer, "%lg", &x))
|
||||
{
|
||||
*value = x;
|
||||
@@ -657,8 +657,8 @@ const wchar_t* ON_wString::ToNumber(
|
||||
local_buffer[local_buffer_count++] = 0;
|
||||
|
||||
double x = value_on_failure;
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
|
||||
if (1 == sscanf(local_buffer, "%lg", &x))
|
||||
{
|
||||
*value = x;
|
||||
|
||||
Reference in New Issue
Block a user