Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / stglibs / common.lib / include / stg / common.h

diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h
index 623d82d073aed1552bf531df2e40e4d86080f560..a9cc05b1f94e8df0e40e720810023741344fbbca 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -31,6 +31,7 @@
 #include <time.h>
 #else
 #include <ctime>
 #include <time.h>
 #else
 #include <ctime>

+#include <climits> // NAME_MAX

 #endif
 #include <string>
 #include <sstream>
 #endif
 #include <string>
 #include <sstream>


@@ -159,6 +160,8 @@ bool WriteAll(int sd, const void * source, size_t size);
 
 std::string ToPrintable(const std::string & src);
 
 
 std::string ToPrintable(const std::string & src);
 

+std::string formatTime(time_t value);
+time_t readTime(const std::string & value);

 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);
 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);