Mapgen: Remove '#include treegen.h' from non-mgv6 mapgens

[minetest.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index a4016e8d7b43e5ee4e4e6587cbb9c2b1bc83cdf2..902547ea9790fb8b4af53892403465dd5016ddc8 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -60,7 +60,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <unistd.h>
        #include <stdint.h> //for uintptr_t
 
-       #if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
+       // Use standard Posix macro for Linux
+       #if (defined(linux) || defined(__linux)) && !defined(__linux__)
+               #define __linux__ 
+       #endif
+       #if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
                #define _GNU_SOURCE
        #endif
 
@@ -142,6 +146,16 @@ extern std::string path_share;
 */
 extern std::string path_user;
 
+/*
+       Path to gettext locale files
+*/
+extern std::string path_locale;
+
+/*
+       Path to directory for storing caches.
+*/
+extern std::string path_cache;
+
 /*
        Get full path of stuff in data directory.
        Example: "stone.png" -> "../data/stone.png"
@@ -149,7 +163,13 @@ extern std::string path_user;
 std::string getDataPath(const char *subpath);
 
 /*
-       Initialize path_share and path_user.
+       Move cache folder from path_user to the
+       system cache location if possible.
+*/
+void migrateCachePath();
+
+/*
+       Initialize path_*.
 */
 void initializePaths();
 
@@ -195,43 +215,56 @@ void initIrrlicht(irr::IrrlichtDevice * );
        }
 
 #else // Posix
-
-       inline u32 getTimeS()
+       inline void _os_get_clock(struct timespec *ts)
        {
+#if defined(__MACH__) && defined(__APPLE__)
+       // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
+       // OS X does not have clock_gettime, use clock_get_time
+               clock_serv_t cclock;
+               mach_timespec_t mts;
+               host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+               clock_get_time(cclock, &mts);
+               mach_port_deallocate(mach_task_self(), cclock);
+               ts->tv_sec = mts.tv_sec;
+               ts->tv_nsec = mts.tv_nsec;
+#elif defined(CLOCK_MONOTONIC_RAW)
+               clock_gettime(CLOCK_MONOTONIC_RAW, ts);
+#elif defined(_POSIX_MONOTONIC_CLOCK)
+               clock_gettime(CLOCK_MONOTONIC, ts);
+#else
                struct timeval tv;
                gettimeofday(&tv, NULL);
-               return tv.tv_sec;
+               TIMEVAL_TO_TIMESPEC(&tv, ts);
+#endif // defined(__MACH__) && defined(__APPLE__)
+       }
+
+       // Note: these clock functions do not return wall time, but
+       // generally a clock that starts at 0 when the process starts.
+       inline u32 getTimeS()
+       {
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec;
        }
 
        inline u32 getTimeMs()
        {
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
        }
 
        inline u32 getTimeUs()
        {
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               return tv.tv_sec * 1000000 + tv.tv_usec;
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
        }
 
        inline u32 getTimeNs()
        {
                struct timespec ts;
-               // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
-#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
-               clock_serv_t cclock;
-               mach_timespec_t mts;
-               host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-               clock_get_time(cclock, &mts);
-               mach_port_deallocate(mach_task_self(), cclock);
-               ts.tv_sec = mts.tv_sec;
-               ts.tv_nsec = mts.tv_nsec;
-#else
-               clock_gettime(CLOCK_REALTIME, &ts);
-#endif
+               _os_get_clock(&ts);
                return ts.tv_sec * 1000000000 + ts.tv_nsec;
        }
 
@@ -292,7 +325,7 @@ inline const char *getPlatformName()
        return
 #if defined(ANDROID)
        "Android"
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
        "Linux"
 #elif defined(_WIN32) || defined(_WIN64)
        "Windows"
@@ -334,10 +367,16 @@ inline const char *getPlatformName()
 void setXorgClassHint(const video::SExposedVideoData &video_data,
        const std::string &name);
 
+bool setWindowIcon(IrrlichtDevice *device);
+
+bool setXorgWindowIconFromPath(IrrlichtDevice *device,
+       const std::string &icon_file);
+
 // This only needs to be called at the start of execution, since all future
 // threads in the process inherit this exception handler
 void setWin32ExceptionHandler();
 
+bool secure_rand_fill_buf(void *buf, size_t len);
 } // namespace porting
 
 #ifdef __ANDROID__