From: Elena Mamontova <helenh463@gmail.com>
Date: Tue, 20 Dec 2016 13:40:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket37
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/1b2e8014ab6bc93d0ab0fe320ad3cfc8ed94ab81?ds=inline;hp=-c

Merge remote-tracking branch 'origin/stg-2.409' into ticket37
---

1b2e8014ab6bc93d0ab0fe320ad3cfc8ed94ab81
diff --combined stglibs/common.lib/include/stg/common.h
index 6734a435,14ba7220..8e82d2a8
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@@ -31,6 -31,7 +31,7 @@@
  #include <time.h>
  #else
  #include <ctime>
+ #include <climits> // NAME_MAX
  #endif
  #include <string>
  #include <sstream>
@@@ -149,8 -150,6 +150,8 @@@ bool WriteAll(int sd, const void * sour
  
  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);