Sync changes from upstream repository

This commit is contained in:
Bozo
2019-06-10 03:00:01 -07:00
parent 3f3fe73c59
commit 7c522f6703
45 changed files with 387 additions and 172 deletions

View File

@@ -85,8 +85,8 @@ int ON_String::ScanBufferVargs(
va_list args
)
{
#if defined(ON_COMPILER_CLANG)
#if defined(ON_RUNTIME_ANDROID)
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
if (nullptr == buffer || nullptr == format)
return -1;
return vsscanf(buffer, format, args);
@@ -148,8 +148,8 @@ int ON_wString::ScanBufferVargs(
va_list args
)
{
#if defined(ON_COMPILER_CLANG)
#if defined(ON_RUNTIME_ANDROID)
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
if (nullptr == buffer || nullptr == format)
return -1;
return swscanf(buffer, format, args);
@@ -397,8 +397,8 @@ const char* ON_String::ToNumber(
local_buffer[local_buffer_count++] = 0;
double x = value_on_failure;
#if defined(ON_COMPILER_CLANG)
#if defined(ON_RUNTIME_ANDROID)
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
if (1 == sscanf(local_buffer, "%lg", &x))
{
*value = x;
@@ -639,8 +639,8 @@ const wchar_t* ON_wString::ToNumber(
local_buffer[local_buffer_count++] = 0;
double x = value_on_failure;
#if defined(ON_COMPILER_CLANG)
#if defined(ON_RUNTIME_ANDROID)
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
if (1 == sscanf(local_buffer, "%lg", &x))
{
*value = x;