From: Maxim Mamontov <faust.madf@gmail.com>
Date: Thu, 22 Dec 2016 19:46:27 +0000 (+0200)
Subject: Merge branch 'stg-2.409' into stg-2.409-radius
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/e39f173d25ae650ee843e3d1c311abe9c1cb5ee9?ds=sidebyside;hp=--cc

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

e39f173d25ae650ee843e3d1c311abe9c1cb5ee9
diff --cc stglibs/common.lib/include/stg/common.h
index a20c3d9f,8e82d2a8..d404e013
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@@ -27,15 -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)