diff options
| author | Arcady Goldmints-Orlov <arcady@lunarg.com> | 2023-02-20 20:02:36 -0500 |
|---|---|---|
| committer | arcady-lunarg <122813703+arcady-lunarg@users.noreply.github.com> | 2023-05-15 14:06:02 -0600 |
| commit | 1e4955adbcd9b3f5eaf2129e918ca057baed6520 (patch) | |
| tree | c0ac6e7b7e4c7f3b403cb60d370f6bffe2892a39 | |
| parent | d9c3c7538b2449e39cfb0d793702d218ed58ff03 (diff) | |
| download | glslang-1e4955adbcd9b3f5eaf2129e918ca057baed6520.tar.gz | |
Include <cstdint> header in Common.h
This change also cleans up some ifdef'd code for no longer supported
versions of MSVC.
Fixes: #3139
| -rw-r--r-- | glslang/Include/Common.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h index c7f52563..080b8071 100644 --- a/glslang/Include/Common.h +++ b/glslang/Include/Common.h @@ -44,6 +44,7 @@ #else #include <cmath> #endif +#include <cstdint> #include <cstdio> #include <cstdlib> #include <list> @@ -66,7 +67,7 @@ std::string to_string(const T& val) { } #endif -#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API) +#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API #include <basetsd.h> #ifndef snprintf #define snprintf sprintf_s @@ -82,22 +83,6 @@ std::string to_string(const T& val) { #define UINT_PTR uintptr_t #endif -#if defined(_MSC_VER) && _MSC_VER < 1800 - #include <stdlib.h> - inline long long int strtoll (const char* str, char** endptr, int base) - { - return _strtoi64(str, endptr, base); - } - inline unsigned long long int strtoull (const char* str, char** endptr, int base) - { - return _strtoui64(str, endptr, base); - } - inline long long int atoll (const char* str) - { - return strtoll(str, NULL, 10); - } -#endif - #if defined(_MSC_VER) #define strdup _strdup #endif |