mirror of
https://github.com/glest/glest-source.git
synced 2025-08-08 17:36:30 +02:00
Normalized defaults
This commit is contained in:
@@ -274,7 +274,7 @@ namespace Shared {
|
||||
inline string trim_at_delim(const string & s, const string &t) {
|
||||
string d(s);
|
||||
string::size_type i(d.find(t));
|
||||
//printf("Searching for [%s] in [%s] got " MG_SIZE_T_SPECIFIER "\n",t.c_str(),d.c_str(),i);
|
||||
//printf("Searching for [%s] in [%s] got " SIZE_T_SPECIFIER "\n",t.c_str(),d.c_str(),i);
|
||||
|
||||
if (i == string::npos) {
|
||||
return d;
|
||||
|
@@ -30,7 +30,7 @@
|
||||
|
||||
typedef SOCKET PLATFORM_SOCKET;
|
||||
#if defined(_WIN64)
|
||||
#define PLATFORM_SOCKET_FORMAT_TYPE MG_I64U_SPECIFIER
|
||||
#define PLATFORM_SOCKET_FORMAT_TYPE I64U_SPECIFIER
|
||||
#else
|
||||
#define PLATFORM_SOCKET_FORMAT_TYPE "%d"
|
||||
#endif
|
||||
|
@@ -37,32 +37,32 @@
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#define MG_SIZE_T_SPECIFIER "%Iu"
|
||||
#define MG_SSIZE_T_SPECIFIER "%Id"
|
||||
#define MG_PTRDIFF_T_SPECIFIER "%Id"
|
||||
#define MG_I64_SPECIFIER "%I64d"
|
||||
#define MG_I64U_SPECIFIER "%I64u"
|
||||
#define SIZE_T_SPECIFIER "%Iu"
|
||||
#define SSIZE_T_SPECIFIER "%Id"
|
||||
#define PTRDIFF_T_SPECIFIER "%Id"
|
||||
#define I64_SPECIFIER "%I64d"
|
||||
#define I64U_SPECIFIER "%I64u"
|
||||
#elif defined(__GNUC__)
|
||||
#define MG_SIZE_T_SPECIFIER "%zu"
|
||||
#define MG_SSIZE_T_SPECIFIER "%zd"
|
||||
#define MG_PTRDIFF_T_SPECIFIER "%zd"
|
||||
#define MG_I64_SPECIFIER "%" PRId64""
|
||||
#define MG_I64U_SPECIFIER "%" PRIu64""
|
||||
#define SIZE_T_SPECIFIER "%zu"
|
||||
#define SSIZE_T_SPECIFIER "%zd"
|
||||
#define PTRDIFF_T_SPECIFIER "%zd"
|
||||
#define I64_SPECIFIER "%" PRId64""
|
||||
#define I64U_SPECIFIER "%" PRIu64""
|
||||
#else
|
||||
|
||||
#if NUMBITS == 32
|
||||
#define MG_SIZE_T_SPECIFIER "%lu"
|
||||
#define MG_SSIZE_T_SPECIFIER "%ld"
|
||||
#define MG_PTRDIFF_T_SPECIFIER "%ld"
|
||||
#define MG_I64_SPECIFIER "%lld"
|
||||
#define MG_I64U_SPECIFIER "%llu"
|
||||
#define SIZE_T_SPECIFIER "%lu"
|
||||
#define SSIZE_T_SPECIFIER "%ld"
|
||||
#define PTRDIFF_T_SPECIFIER "%ld"
|
||||
#define I64_SPECIFIER "%lld"
|
||||
#define I64U_SPECIFIER "%llu"
|
||||
|
||||
#else
|
||||
#define MG_SIZE_T_SPECIFIER "%llu"
|
||||
#define MG_SSIZE_T_SPECIFIER "%lld"
|
||||
#define MG_PTRDIFF_T_SPECIFIER "%lld"
|
||||
#define MG_I64_SPECIFIER "%lld"
|
||||
#define MG_I64U_SPECIFIER "%llu"
|
||||
#define SIZE_T_SPECIFIER "%llu"
|
||||
#define SSIZE_T_SPECIFIER "%lld"
|
||||
#define PTRDIFF_T_SPECIFIER "%lld"
|
||||
#define I64_SPECIFIER "%lld"
|
||||
#define I64U_SPECIFIER "%llu"
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user