Fixed redefined macros warning.

This commit is contained in:
Branimir Karadžić
2017-11-13 14:47:58 -08:00
parent 03a6f9d6f2
commit 8ee7f1cccb
2 changed files with 13 additions and 10 deletions

5
3rdparty/.editorconfig vendored Normal file
View File

@@ -0,0 +1,5 @@
root = true
[ini/*]
indent_style = space
indent_size = 4

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

@@ -388,36 +388,34 @@ the length is determined automatically, but in this case `value` has to be zero-
#define INITIAL_CAPACITY ( 256 )
#define _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#ifndef _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_NONSTDC_NO_DEPRECATE
#endif
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
#include <stddef.h>
#ifndef INI_MALLOC
#define _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#include <stdlib.h>
#define INI_MALLOC( ctx, size ) ( malloc( size ) )
#define INI_FREE( ctx, ptr ) ( free( ptr ) )
#endif
#ifndef INI_MEMCPY
#define _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#include <string.h>
#define INI_MEMCPY( dst, src, cnt ) ( memcpy( dst, src, cnt ) )
#endif
#ifndef INI_STRLEN
#define _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#include <string.h>
#define INI_STRLEN( s ) ( strlen( s ) )
#endif
#ifndef INI_STRICMP
#ifdef _WIN32
#define _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#include <string.h>
#define INI_STRICMP( s1, s2 ) ( stricmp( s1, s2 ) )
#else