Merge branch 'master' of github.com:bkaradzic/bx

This commit is contained in:
Branimir Karadžić
2017-11-14 16:53:31 -08:00
22 changed files with 28 additions and 6 deletions

View File

@@ -3,3 +3,4 @@ root = true
[ini/*]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

12
3rdparty/ini/ini.h vendored
View File

@@ -166,7 +166,7 @@ to substitute them for your own. Here's an example:
#define INI_IMPLEMENTATION
#define INI_MEMCPY( dst, src, cnt ) ( my_memcpy_func( dst, src, cnt ) )
#define INI_STRLEN( s ) ( my_strlen_func( s ) )
#define INI_STRICMP( s1, s2 ) ( my_stricmp_func( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( my_strnicmp_func( s1, s2, cnt ) )
#include "ini.h"
If no custom function is defined, ini.h will default to the C runtime library equivalent.
@@ -414,13 +414,13 @@ the length is determined automatically, but in this case `value` has to be zero-
#define INI_STRLEN( s ) ( strlen( s ) )
#endif
#ifndef INI_STRICMP
#ifndef INI_STRNICMP
#ifdef _WIN32
#include <string.h>
#define INI_STRICMP( s1, s2 ) ( stricmp( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( strnicmp( s1, s2, cnt ) )
#else
#include <string.h>
#define INI_STRICMP( s1, s2 ) ( strcasecmp( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( strncasecmp( s1, s2, cnt ) )
#endif
#endif
@@ -738,7 +738,7 @@ int ini_find_section( ini_t const* ini, char const* name, int name_length )
{
char const* const other =
ini->sections[ i ].name_large ? ini->sections[ i ].name_large : ini->sections[ i ].name;
if( (int) INI_STRLEN( other ) == name_length && INI_STRICMP( name, other, name_length) == 0 )
if( (int) INI_STRLEN( other ) == name_length && INI_STRNICMP( name, other, name_length ) == 0 )
return i;
}
}
@@ -762,7 +762,7 @@ int ini_find_property( ini_t const* ini, int section, char const* name, int name
{
char const* const other =
ini->properties[ i ].name_large ? ini->properties[ i ].name_large : ini->properties[ i ].name;
if( (int) INI_STRLEN( other ) == name_length && INI_STRICMP( name, other, name_length) == 0 )
if( (int) INI_STRLEN( other ) == name_length && INI_STRNICMP( name, other, name_length ) == 0 )
return c;
++c;
}

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/allocator.h>
#include <malloc.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/debug.h>
#include <bx/readerwriter.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/commandline.h>
#include <bx/string.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/debug.h>
#include <bx/sort.h>
#include <bx/readerwriter.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/debug.h>
#include <bx/string.h> // isPrint
#include <bx/readerwriter.h> // WriterI

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/cpu.h>
#include <bx/math.h>
#include <bx/string.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/easing.h>
namespace bx

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/file.h>
#include <stdio.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/file.h>
#include <bx/os.h>
#include <bx/readerwriter.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/hash.h>
namespace bx

View File

@@ -3,7 +3,9 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/math.h>
#include <math.h>
namespace bx

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/mutex.h>
#if BX_CONFIG_SUPPORTS_THREADING

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/string.h>
#include <bx/os.h>
#include <bx/uint32_t.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/process.h>
#include <stdio.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/settings.h>
namespace

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/sort.h>
namespace bx

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/allocator.h>
#include <bx/hash.h>
#include <bx/readerwriter.h>

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/thread.h>
#if BX_PLATFORM_ANDROID \

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bx#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/timer.h>
#if BX_PLATFORM_ANDROID

View File

@@ -3,6 +3,7 @@
* License: https://github.com/bkaradzic/bnet#license-bsd-2-clause
*/
#include "bx_p.h"
#include <bx/url.h>
namespace bx