diff options
| author | Ladislav <Zezula> | 2013-11-15 10:17:43 +0100 |
|---|---|---|
| committer | Ladislav <Zezula> | 2013-11-15 10:17:43 +0100 |
| commit | 87eb1df287ebe76725d376a28facccbe0ccd7f92 (patch) | |
| tree | d911227a2c9976a075426f9817812f9119404759 /src/StormPort.h | |
| parent | a9579a3f4ab1a27a822bcc53f3e6a9b1a00e6418 (diff) | |
+ Support for compile-time messages for deprecated symbols
+ Replaced MPQ_FILE_COMPRESSED with more descriptive MPQ_FILE_COMPRESS_MASK
Diffstat (limited to 'src/StormPort.h')
| -rw-r--r-- | src/StormPort.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/StormPort.h b/src/StormPort.h index b2d3158..4e34280 100644 --- a/src/StormPort.h +++ b/src/StormPort.h @@ -33,7 +33,9 @@ #define false 0 #endif +//----------------------------------------------------------------------------- // Defines for Windows + #if !defined(PLATFORM_DEFINED) && (defined(WIN32) || defined(WIN64)) // In MSVC 8.0, there are some functions declared as deprecated. @@ -61,7 +63,9 @@ #endif -// Defines for Mac +//----------------------------------------------------------------------------- +// Defines for Mac + #if !defined(PLATFORM_DEFINED) && defined(__APPLE__) // Mac BSD API // Macintosh @@ -92,7 +96,9 @@ #endif +//----------------------------------------------------------------------------- // Assumption: we are not on Windows nor Macintosh, so this must be linux *grin* + #if !defined(PLATFORM_DEFINED) #include <sys/types.h> @@ -115,7 +121,9 @@ #endif -// Definition of Windows-specific structures for non-Windows platforms +//----------------------------------------------------------------------------- +// Definition of Windows-specific types for non-Windows platforms + #ifndef PLATFORM_WINDOWS #if __LP64__ #define PLATFORM_64BIT @@ -199,6 +207,9 @@ #define ERROR_FILE_CORRUPT 1004 // No such error code under Linux #endif +//----------------------------------------------------------------------------- +// Swapping functions + #ifdef PLATFORM_LITTLE_ENDIAN #define BSWAP_INT16_UNSIGNED(a) (a) #define BSWAP_INT16_SIGNED(a) (a) @@ -249,4 +260,17 @@ #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 + #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated(_Text))) +#endif + #endif // __STORMPORT_H__ |