Merge branch 'stg-2.409' into stg-2.409-radius

[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 14ba722021c2246c5302067dfcb7a64a33aedfbe..d404e013a824332976699956b036392f701d579b 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -27,17 +27,16 @@
 #ifndef common_h
 #define common_h
 
-#ifdef __BORLANDC__
-#include <time.h>
-#else
-#include <ctime>
-#include <climits> // NAME_MAX
-#endif
+#include "stg/os_int.h"
+#include "stg/const.h"
+
 #include <string>
 #include <sstream>
+#include <ctime>
+#include <climits> // NAME_MAX
 
-#include "stg/os_int.h"
-#include "stg/const.h"
+#include <unistd.h> // uid_t, gid_t
+#include <sys/stat.h> // mode_t
 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)
@@ -150,6 +149,8 @@ bool WriteAll(int sd, const void * source, size_t size);
 
 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);
@@ -301,4 +302,8 @@ const std::string & unsigned2str(varT x, std::string & s)
 char * stg_strptime(const char *, const char *, struct tm *);
 time_t stg_timegm(struct tm *);
 
+uid_t str2uid(const std::string& name);
+gid_t str2gid(const std::string& name);
+mode_t str2mode(const std::string& mode);
+
 #endif