Branimir Karadžić 9 år sedan
förälder
incheckning
39bf072bb4
6 ändrade filer med 10 tillägg och 11 borttagningar
  1. 2 2
      include/bx/crtimpl.h
  2. 2 2
      include/bx/macros.h
  3. 4 4
      include/bx/os.h
  4. 0 1
      include/bx/platform.h
  5. 1 1
      include/bx/readerwriter.h
  6. 1 1
      include/bx/string.h

+ 2 - 2
include/bx/crtimpl.h

@@ -194,10 +194,10 @@ namespace bx
 
 
 #if BX_CONFIG_CRT_PROCESS
 #if BX_CONFIG_CRT_PROCESS
 
 
-#if BX_COMPILER_MSVC_COMPATIBLE
+#if BX_CRT_MSVC
 #	define popen  _popen
 #	define popen  _popen
 #	define pclose _pclose
 #	define pclose _pclose
-#endif // BX_COMPILER_MSVC_COMPATIBLE
+#endif // BX_CRT_MSVC
 
 
 	class ProcessReader : public ReaderOpenI, public CloserI, public ReaderI
 	class ProcessReader : public ReaderOpenI, public CloserI, public ReaderI
 	{
 	{

+ 2 - 2
include/bx/macros.h

@@ -79,9 +79,9 @@
 #		define BX_THREAD_LOCAL __thread
 #		define BX_THREAD_LOCAL __thread
 #	endif // BX_COMPILER_GCC
 #	endif // BX_COMPILER_GCC
 #	define BX_ATTRIBUTE(_x) __attribute__( (_x) )
 #	define BX_ATTRIBUTE(_x) __attribute__( (_x) )
-#	if BX_COMPILER_MSVC_COMPATIBLE
+#	if BX_CRT_MSVC
 #		define __stdcall
 #		define __stdcall
-#	endif // BX_COMPILER_MSVC_COMPATIBLE
+#	endif // BX_CRT_MSVC
 #elif BX_COMPILER_MSVC
 #elif BX_COMPILER_MSVC
 #	define BX_ALIGN_DECL(_align, _decl) __declspec(align(_align) ) _decl
 #	define BX_ALIGN_DECL(_align, _decl) __declspec(align(_align) ) _decl
 #	define BX_ALLOW_UNUSED
 #	define BX_ALLOW_UNUSED

+ 4 - 4
include/bx/os.h

@@ -56,11 +56,11 @@
 #	endif // BX_PLATFORM_ANDROID
 #	endif // BX_PLATFORM_ANDROID
 #endif // BX_PLATFORM_
 #endif // BX_PLATFORM_
 
 
-#if BX_COMPILER_MSVC_COMPATIBLE
+#if BX_CRT_MSVC
 #	include <direct.h> // _getcwd
 #	include <direct.h> // _getcwd
 #else
 #else
 #	include <unistd.h> // getcwd
 #	include <unistd.h> // getcwd
-#endif // BX_COMPILER_MSVC
+#endif // BX_CRT_MSVC
 
 
 #if BX_PLATFORM_OSX
 #if BX_PLATFORM_OSX
 #	define BX_DL_EXT "dylib"
 #	define BX_DL_EXT "dylib"
@@ -254,7 +254,7 @@ namespace bx
  || BX_PLATFORM_WINRT
  || BX_PLATFORM_WINRT
 		BX_UNUSED(_path);
 		BX_UNUSED(_path);
 		return -1;
 		return -1;
-#elif BX_COMPILER_MSVC_COMPATIBLE
+#elif BX_CRT_MSVC
 		return ::_chdir(_path);
 		return ::_chdir(_path);
 #else
 #else
 		return ::chdir(_path);
 		return ::chdir(_path);
@@ -268,7 +268,7 @@ namespace bx
  || BX_PLATFORM_WINRT
  || BX_PLATFORM_WINRT
 		BX_UNUSED(_buffer, _size);
 		BX_UNUSED(_buffer, _size);
 		return NULL;
 		return NULL;
-#elif BX_COMPILER_MSVC_COMPATIBLE
+#elif BX_CRT_MSVC
 		return ::_getcwd(_buffer, (int)_size);
 		return ::_getcwd(_buffer, (int)_size);
 #else
 #else
 		return ::getcwd(_buffer, _size);
 		return ::getcwd(_buffer, _size);

+ 0 - 1
include/bx/platform.h

@@ -15,7 +15,6 @@
 #define BX_COMPILER_CLANG_ANALYZER  0
 #define BX_COMPILER_CLANG_ANALYZER  0
 #define BX_COMPILER_GCC             0
 #define BX_COMPILER_GCC             0
 #define BX_COMPILER_MSVC            0
 #define BX_COMPILER_MSVC            0
-#define BX_COMPILER_MSVC_COMPATIBLE (BX_CRT_MSVC)
 
 
 // Endianess
 // Endianess
 #define BX_CPU_ENDIAN_BIG    0
 #define BX_CPU_ENDIAN_BIG    0

+ 1 - 1
include/bx/readerwriter.h

@@ -16,7 +16,7 @@
 #include "error.h"
 #include "error.h"
 #include "uint32_t.h"
 #include "uint32_t.h"
 
 
-#if BX_COMPILER_MSVC_COMPATIBLE
+#if BX_CRT_MSVC
 #	define fseeko64 _fseeki64
 #	define fseeko64 _fseeki64
 #	define ftello64 _ftelli64
 #	define ftello64 _ftelli64
 #elif BX_PLATFORM_ANDROID || BX_PLATFORM_BSD || BX_PLATFORM_IOS || BX_PLATFORM_OSX || BX_PLATFORM_QNX
 #elif BX_PLATFORM_ANDROID || BX_PLATFORM_BSD || BX_PLATFORM_IOS || BX_PLATFORM_OSX || BX_PLATFORM_QNX

+ 1 - 1
include/bx/string.h

@@ -30,7 +30,7 @@ namespace bx
 	/// Case insensitive string compare.
 	/// Case insensitive string compare.
 	inline int32_t stricmp(const char* _a, const char* _b)
 	inline int32_t stricmp(const char* _a, const char* _b)
 	{
 	{
-#if BX_COMPILER_MSVC_COMPATIBLE
+#if BX_CRT_MSVC
 		return ::_stricmp(_a, _b);
 		return ::_stricmp(_a, _b);
 #else
 #else
 		return ::strcasecmp(_a, _b);
 		return ::strcasecmp(_a, _b);