Fix sign-compare compiler warnings in mg_ore.cpp

[minetest.git] / src / gettime.h

diff --git a/src/gettime.h b/src/gettime.h
index b195526d47a23782d32acd71a9cf58d91f1dff53..44c1590262290546aa5b5dc2a465936856276f3c 100644 (file)
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 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.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GETTIME_HEADER
 #define GETTIME_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 
 /*
        Get a millisecond counter value.
@@ -31,7 +31,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                Normal build: main.cpp
                Server build: servermain.cpp
 */
+enum TimePrecision {
+       PRECISION_SECONDS = 0,
+       PRECISION_MILLI,
+       PRECISION_MICRO,
+       PRECISION_NANO
+};
+
 extern u32 getTimeMs();
+extern u32 getTime(TimePrecision prec);
 
 /*
        Timestamp stuff
@@ -46,8 +54,8 @@ inline std::string getTimestamp()
        // This is not really thread-safe but it won't break anything
        // except its own output, so just go with it.
        struct tm *tm = localtime(&t);
-       char cs[20];
-       strftime(cs, 20, "%H:%M:%S", tm);
+       char cs[20]; //YYYY-MM-DD HH:MM:SS + '\0'
+       strftime(cs, 20, "%Y-%m-%d %H:%M:%S", tm);
        return cs;
 }