Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 4e663390a7050c26fed18bd5c03603311afaf288..93932e1d9ed3207a82bd680e6a7de0a32de4cc66 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -56,7 +56,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define sleep_ms(x) Sleep(x)
 #else
        #include <unistd.h>
-       #include <stdint.h> //for uintptr_t
+       #include <cstdint> //for uintptr_t
 
        // Use standard Posix macro for Linux
        #if (defined(linux) || defined(__linux)) && !defined(__linux__)
@@ -112,8 +112,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifndef _WIN32 // Posix
        #include <sys/time.h>
-       #include <time.h>
-       #if defined(__MACH__) && defined(__APPLE__)
+       #include <ctime>
+
+#if defined(__MACH__) && defined(__APPLE__)
                #include <mach/clock.h>
                #include <mach/mach.h>
        #endif
@@ -126,10 +127,10 @@ namespace porting
        Signal handler (grabs Ctrl-C on POSIX systems)
 */
 
-void signal_handler_init(void);
+void signal_handler_init();
 // Returns a pointer to a bool.
 // When the bool is true, program should quit.
-bool * signal_handler_killstatus(void);
+bool * signal_handler_killstatus();
 
 /*
        Path of static data directory.
@@ -233,21 +234,21 @@ inline u64 getTimeMs()
 {
        struct timespec ts;
        os_get_clock(&ts);
-       return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+       return ((u64) ts.tv_sec) * 1000LL + ((u64) ts.tv_nsec) / 1000000LL;
 }
 
 inline u64 getTimeUs()
 {
        struct timespec ts;
        os_get_clock(&ts);
-       return ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+       return ((u64) ts.tv_sec) * 1000000LL + ((u64) ts.tv_nsec) / 1000LL;
 }
 
 inline u64 getTimeNs()
 {
        struct timespec ts;
        os_get_clock(&ts);
-       return ts.tv_sec * 1000000000 + ts.tv_nsec;
+       return ((u64) ts.tv_sec) * 1000000000LL + ((u64) ts.tv_nsec);
 }
 
 #endif
@@ -273,9 +274,9 @@ inline u64 getDeltaMs(u64 old_time_ms, u64 new_time_ms)
 {
        if (new_time_ms >= old_time_ms) {
                return (new_time_ms - old_time_ms);
-       } else {
-               return (old_time_ms - new_time_ms);
        }
+
+       return (old_time_ms - new_time_ms);
 }
 
 inline const char *getPlatformName()
@@ -308,6 +309,8 @@ inline const char *getPlatformName()
        #else
                "SunOS"
        #endif
+#elif defined(__HAIKU__)
+       "Haiku"
 #elif defined(__CYGWIN__)
        "Cygwin"
 #elif defined(__unix__) || defined(__unix)
@@ -325,7 +328,30 @@ inline const char *getPlatformName()
 bool secure_rand_fill_buf(void *buf, size_t len);
 
 // This attaches to the parents process console, or creates a new one if it doesnt exist.
-void attachOrCreateConsole(void);
+void attachOrCreateConsole();
+
+int mt_snprintf(char *buf, const size_t buf_size, const char *fmt, ...);
+
+/**
+ * Opens URL in default web browser
+ *
+ * Must begin with http:// or https://, and not contain any new lines
+ *
+ * @param url The URL
+ * @return true on success, false on failure
+ */
+bool open_url(const std::string &url);
+
+/**
+ * Opens a directory in the default file manager
+ *
+ * The directory must exist.
+ *
+ * @param path Path to directory
+ * @return true on success, false on failure
+ */
+bool open_directory(const std::string &path);
+
 } // namespace porting
 
 #ifdef __ANDROID__