Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / gettime.h

diff --git a/src/gettime.h b/src/gettime.h
index b5cb830cc241ebe247d7e0ca827d046f0e5c898f..66efef1d71d02005b0503f6864a35f83dedc11cd 100644 (file)
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -17,39 +17,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GETTIME_HEADER
-#define GETTIME_HEADER
+#pragma once
 
-#include "irrlichttypes.h"
-
-/*
-       Get a millisecond counter value.
-       Precision depends on implementation.
-       Overflows at any value above 10000000.
-
-       Implementation of this is done in:
-               Normal build: main.cpp
-               Server build: servermain.cpp
-*/
-extern u32 getTimeMs();
-
-/*
-       Timestamp stuff
-*/
-
-#include <time.h>
+#include <ctime>
 #include <string>
 
+enum TimePrecision
+{
+       PRECISION_SECONDS,
+       PRECISION_MILLI,
+       PRECISION_MICRO,
+       PRECISION_NANO
+};
+
 inline std::string getTimestamp()
 {
        time_t t = time(NULL);
        // 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;
 }
-
-
-#endif