X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fporting.h;h=c8d19154c9c341fde8b708d4939e7c8e71f82233;hb=8e5b33d3590719ff2cf1138f563e928d05754d7a;hp=4970a84787856d24a4b3e82ff6ce37206d50fd58;hpb=ee8b6d34447acab3ffb318dc8c070df890c1b810;p=oweals%2Fminetest.git

diff --git a/src/porting.h b/src/porting.h
index 4970a8478..c8d19154c 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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,8 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PORTING_HEADER
 
 #include <string>
-// Included for u32 and such
-#include "common_irrlicht.h"
+#include "irrlichttypes.h" // u32
 #include "debug.h"
 #include "constants.h"
 
@@ -36,14 +35,37 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#define SWPRINTF_CHARSTRING L"%s"
 #endif
 
+//currently not needed
+//template<typename T> struct alignment_trick { char c; T member; };
+//#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
+
 #ifdef _WIN32
 	#include <windows.h>
+	
 	#define sleep_ms(x) Sleep(x)
 #else
 	#include <unistd.h>
+	#include <stdint.h> //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
 {
 
@@ -59,7 +81,7 @@ 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:
@@ -67,7 +89,7 @@ extern std::string path_data;
 	Linux: "~/.<PROJECT_NAME>"
 	Mac: "~/Library/Application Support/<PROJECT_NAME>"
 */
-extern std::string path_userdata;
+extern std::string path_user;
 
 /*
 	Get full path of stuff in data directory.
@@ -76,7 +98,7 @@ extern std::string path_userdata;
 std::string getDataPath(const char *subpath);
 
 /*
-	Initialize path_data and path_userdata.
+	Initialize path_share and path_user.
 */
 void initializePaths();