diff options
| author | kwolekr <mirrorisim@gmail.com> | 2013-01-18 14:12:19 -0500 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2013-01-21 21:41:37 +0200 |
| commit | b55fb4f2f6952f08ede8b37ba15ec8639410cca4 (patch) | |
| tree | bf3d12c17f0f3f430ebae73ef61721bb300630da /src/settings.h | |
| parent | 1cd8351054c6f0b120e603e0e25b85da385f185a (diff) | |
| download | minetest-b55fb4f2f6952f08ede8b37ba15ec8639410cca4.tar.gz minetest-b55fb4f2f6952f08ede8b37ba15ec8639410cca4.tar.bz2 minetest-b55fb4f2f6952f08ede8b37ba15ec8639410cca4.zip | |
Last set of minor cleanups
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 18 |
1 files changed, 1 insertions, 17 deletions
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<typename T> struct alignment_trick { char c; T member; }; -//#define ALIGNOF(type) offsetof (alignment_trick<type>, 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 <class T> T *getStruct(std::string name, std::string format) { size_t len = sizeof(T); |