diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/FileStream.cpp | 2 | ||||
| -rw-r--r-- | src/StormPort.h | 44 |
2 files changed, 14 insertions, 32 deletions
diff --git a/src/FileStream.cpp b/src/FileStream.cpp index 2266518..a3c8e9b 100644 --- a/src/FileStream.cpp +++ b/src/FileStream.cpp @@ -34,7 +34,7 @@ // Local functions - platform-specific functions
#ifndef STORMLIB_WINDOWS
-static thread_local DWORD nLastError = ERROR_SUCCESS;
+static THREAD_LOCAL DWORD nLastError = ERROR_SUCCESS;
DWORD GetLastError()
{
diff --git a/src/StormPort.h b/src/StormPort.h index 4cd967f..ec9fc07 100644 --- a/src/StormPort.h +++ b/src/StormPort.h @@ -94,7 +94,10 @@ #endif #define PKEXPORT - #define __SYS_ZLIB + + #ifndef __SYS_ZLIB + #define __SYS_ZLIB + #endif #ifndef __SYS_BZLIB #define __SYS_BZLIB @@ -274,7 +277,7 @@ #define STORMLIB_LITTLE_ENDIAN #endif - #define STORMLIB_LINUX + #define THREAD_LOCAL thread_local // Platforms with mmap support #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) @@ -282,6 +285,7 @@ #define STORMLIB_HAS_MMAP #endif + #define STORMLIB_LINUX #define STORMLIB_PLATFORM_DEFINED #endif @@ -366,8 +370,8 @@ #define O_LARGEFILE 0 #endif -// Platform-specific error codes for UNIX-based platforms -#if defined(STORMLIB_MAC) || defined(STORMLIB_LINUX) +// Platform-specific error codes for non-Windows platforms +#ifndef ERROR_SUCCESS #define ERROR_SUCCESS 0 #define ERROR_FILE_NOT_FOUND ENOENT #define ERROR_ACCESS_DENIED EPERM @@ -386,10 +390,15 @@ #define ERROR_FILE_CORRUPT 1004 // No such error code under Linux #endif +// Macros that can sometimes be missing #ifndef _countof #define _countof(x) (sizeof(x) / sizeof(x[0])) #endif +#ifndef THREAD_LOCAL + #define THREAD_LOCAL +#endif + //----------------------------------------------------------------------------- // Swapping functions @@ -439,31 +448,4 @@ #define BSWAP_TMPKHEADER(a) ConvertTMPKHeader((a)) #endif -//----------------------------------------------------------------------------- -// Macro for deprecated symbols - -/* -#ifdef _MSC_VER - #if _MSC_FULL_VER >= 140050320 - #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated(_Text)) - #else - #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated) - #endif -#else - #ifdef __GNUC__ - #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated)) - #else - #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated(_Text))) - #endif -#endif - -// When a flag is deprecated, use this macro -#ifndef _STORMLIB_NO_DEPRECATE - #define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) \ - const STORMLIB_DEPRECATED(#oldflag " is deprecated. Use " #newflag ". To supress this warning, define _STORMLIB_NO_DEPRECATE") static type oldflag = (type)newflag; -#else -#define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) static type oldflag = (type)newflag; -#endif -*/ - #endif // __STORMPORT_H__ |