From 8ee7f1cccb6d6bd37b3bdc63fcf72a3c5c0c21f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 13 Nov 2017 14:47:58 -0800
Subject: [PATCH] Fixed redefined macros warning.

---
 3rdparty/.editorconfig |  5 +++++
 3rdparty/ini/ini.h     | 18 ++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 3rdparty/.editorconfig

diff --git a/3rdparty/.editorconfig b/3rdparty/.editorconfig
new file mode 100644
index 0000000..0555dfa
--- /dev/null
+++ b/3rdparty/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+[ini/*]
+indent_style = space
+indent_size  = 4
diff --git a/3rdparty/ini/ini.h b/3rdparty/ini/ini.h
index 90ce40d..6851ecb 100644
--- a/3rdparty/ini/ini.h
+++ b/3rdparty/ini/ini.h
@@ -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