Falling sand and gravel

[oweals/minetest.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 71891de399e72ae2b696afd5b3e1fdb02d702601..4970a84787856d24a4b3e82ff6ce37206d50fd58 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -25,12 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PORTING_HEADER
 
 #include <string>
-// Included for u64 and such
+// Included for u32 and such
 #include "common_irrlicht.h"
 #include "debug.h"
 #include "constants.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
        #define SWPRINTF_CHARSTRING L"%S"
 #else
        #define SWPRINTF_CHARSTRING L"%s"
@@ -47,6 +47,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 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.
 */
@@ -54,9 +63,9 @@ extern std::string path_data;
 
 /*
        Directory for storing user data. Examples:
-       Windows: "C:\Documents and Settings\user\Application Data\<APPNAME>"
-       Linux: "~/.<APPNAME>"
-       Mac: "~/Library/Application Support/<APPNAME>"
+       Windows: "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
+       Linux: "~/.<PROJECT_NAME>"
+       Mac: "~/Library/Application Support/<PROJECT_NAME>"
 */
 extern std::string path_userdata;
 
@@ -64,10 +73,7 @@ extern std::string path_userdata;
        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.
@@ -86,13 +92,20 @@ void initializePaths();
                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