mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include <cstdint> header in Common.h

Browse Source 
This change also cleans up some ifdef'd code for no longer supported
versions of MSVC.

Fixes: #3139
This commit is contained in:
Arcady Goldmints-Orlov 2023-02-20 20:02:36 -05:00 committed by arcady-lunarg
parent d9c3c7538b
commit 1e4955adbc
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glslang/Include/Common.h
View File

@ -44,6 +44,7 @@
#else #else
#include <cmath> #include <cmath>
#endif #endif
#include <cstdint>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <list> #include <list>
@ -66,7 +67,7 @@ std::string to_string(const T& val) {
} }
#endif #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> #include <basetsd.h>
#ifndef snprintf #ifndef snprintf
#define snprintf sprintf_s #define snprintf sprintf_s
@ -82,22 +83,6 @@ std::string to_string(const T& val) {
#define UINT_PTR uintptr_t #define UINT_PTR uintptr_t
#endif #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) #if defined(_MSC_VER)
#define strdup _strdup #define strdup _strdup
#endif #endif