]> git.stg.codes - stg.git/commitdiff
Merge branch 'stg-2.409' into stg-2.409-radius
authorMaxim Mamontov <faust.madf@gmail.com>
Thu, 22 Dec 2016 19:46:27 +0000 (21:46 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Thu, 22 Dec 2016 19:46:27 +0000 (21:46 +0200)
1  2 
stglibs/common.lib/common.cpp
stglibs/common.lib/include/stg/common.h

Simple merge
index a20c3d9fe068ce2e774ddf4fdf683734b79d4413,8e82d2a84e17b099ef63a8b0ad288cc3bdc66c06..d404e013a824332976699956b036392f701d579b
  #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)