X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fporting.h;h=c8d19154c9c341fde8b708d4939e7c8e71f82233;hb=8e5b33d3590719ff2cf1138f563e928d05754d7a;hp=71891de399e72ae2b696afd5b3e1fdb02d702601;hpb=6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa;p=oweals%2Fminetest.git diff --git a/src/porting.h b/src/porting.h index 71891de39..c8d19154c 100644 --- a/src/porting.h +++ b/src/porting.h @@ -3,16 +3,16 @@ Minetest-c55 Copyright (C) 2010 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -25,52 +25,80 @@ with this program; if not, write to the Free Software Foundation, Inc., #define PORTING_HEADER #include -// Included for u64 and such -#include "common_irrlicht.h" +#include "irrlichttypes.h" // u32 #include "debug.h" #include "constants.h" -#ifdef _WIN32 +#ifdef _MSC_VER #define SWPRINTF_CHARSTRING L"%S" #else #define SWPRINTF_CHARSTRING L"%s" #endif +//currently not needed +//template struct alignment_trick { char c; T member; }; +//#define ALIGNOF(type) offsetof (alignment_trick, member) + #ifdef _WIN32 #include + #define sleep_ms(x) Sleep(x) #else #include + #include //for uintptr_t + #define sleep_ms(x) usleep(x*1000) #endif +#ifdef _MSC_VER + #define ALIGNOF(x) __alignof(x) + #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) +#else + #define ALIGNOF(x) __alignof__(x) +#endif + +#ifdef __MINGW32__ + #define strtok_r(x, y, z) mystrtok_r(x, y, z) +#endif + +#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1)) + namespace porting { +/* + Signal handler (grabs Ctrl-C on POSIX systems) +*/ + +void signal_handler_init(void); +// Returns a pointer to a bool. +// When the bool is true, program should quit. +bool * signal_handler_killstatus(void); + /* Path of static data directory. */ -extern std::string path_data; +extern std::string path_share; /* Directory for storing user data. Examples: - Windows: "C:\Documents and Settings\user\Application Data\" - Linux: "~/." - Mac: "~/Library/Application Support/" + Windows: "C:\Documents and Settings\user\Application Data\" + Linux: "~/." + Mac: "~/Library/Application Support/" */ -extern std::string path_userdata; +extern std::string path_user; /* Get full path of stuff in data directory. Example: "stone.png" -> "../data/stone.png" */ -inline std::string getDataPath(const char *subpath) -{ - return path_data + "/" + subpath; -} +std::string getDataPath(const char *subpath); /* - Initialize path_data and path_userdata. + Initialize path_share and path_user. */ void initializePaths(); @@ -86,13 +114,20 @@ void initializePaths(); return GetTickCount(); } #else // Posix - #include + #include + inline u32 getTimeMs() + { + struct timeval tv; + gettimeofday(&tv, NULL); + return tv.tv_sec * 1000 + tv.tv_usec / 1000; + } + /*#include inline u32 getTimeMs() { struct timeb tb; ftime(&tb); return tb.time * 1000 + tb.millitm; - } + }*/ #endif } // namespace porting