From b55fb4f2f6952f08ede8b37ba15ec8639410cca4 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 18 Jan 2013 14:12:19 -0500 Subject: Last set of minor cleanups --- src/settings.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index 18d6ade72..6d6db220c 100644 --- a/src/settings.h +++ b/src/settings.h @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "debug.h" #include "log.h" #include "util/string.h" +#include "porting.h" enum ValueType { @@ -566,23 +567,6 @@ public: return value; } -//template struct alignment_trick { char c; T member; }; -//#define ALIGNOF(type) offsetof (alignment_trick, member) -#ifdef _WIN32 - #define ALIGNOF(x) __alignof(x) -#else - #define ALIGNOF(x) __alignof__(x) -#endif -#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1)) -#ifdef _WIN32 - #define strtok_r(x, y, z) strtok_s(x, y, z) - #define strtof(x, y) (float)strtod(x, y) - #define strtoll(x, y, z) _strtoi64(x, y, z) - #define strtoull(x, y, z) _strtoui64(x, y, z) -#endif - -typedef long long int s64; //to be added to src/irrlichttypes.h later - template T *getStruct(std::string name, std::string format) { size_t len = sizeof(T); -- cgit v1.2.3