Workaround failing Travis clang build.

[dragonfireclient.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 19ac5c6bb920f7ff8c69b163e7e62b46e02ed550..184e1ab54e1ab393f317ea48154e2611cc3f3a74 100644 (file)
--- 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.
 */
@@ -24,26 +24,76 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PORTING_HEADER
 #define PORTING_HEADER
 
-// Included for u64 and such
-#include "common_irrlicht.h"
+#include <string>
+#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<typename T> struct alignment_trick { char c; T member; };
+//#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
+
 #ifdef _WIN32
        #include <windows.h>
+       
+       #define ALIGNOF(x) __alignof(x)
        #define sleep_ms(x) Sleep(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
        #include <unistd.h>
+       #include <stdint.h> //for uintptr_t
+       
+       #define ALIGNOF(x) __alignof__(x)
        #define sleep_ms(x) usleep(x*1000)
 #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_share;
+
+/*
+       Directory for storing user data. Examples:
+       Windows: "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
+       Linux: "~/.<PROJECT_NAME>"
+       Mac: "~/Library/Application Support/<PROJECT_NAME>"
+*/
+extern std::string path_user;
+
+/*
+       Get full path of stuff in data directory.
+       Example: "stone.png" -> "../data/stone.png"
+*/
+std::string getDataPath(const char *subpath);
+
+/*
+       Initialize path_share and path_user.
+*/
+void initializePaths();
+
 /*
        Resolution is 10-20ms.
        Remember to check for overflows.
@@ -56,16 +106,23 @@ namespace porting
                return GetTickCount();
        }
 #else // Posix
-       #include <sys/timeb.h>
+       #include <sys/time.h>
+       inline u32 getTimeMs()
+       {
+               struct timeval tv;
+               gettimeofday(&tv, NULL);
+               return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+       }
+       /*#include <sys/timeb.h>
        inline u32 getTimeMs()
        {
                struct timeb tb;
                ftime(&tb);
                return tb.time * 1000 + tb.millitm;
-       }
+       }*/
 #endif
 
 } // namespace porting
 
-#endif
+#endif // PORTING_HEADER