]> git.stg.codes - stg.git/commitdiff
Merge remote-tracking branch 'origin/stg-2.409' into ticket37
authorElena Mamontova <helenh463@gmail.com>
Tue, 20 Dec 2016 13:40:02 +0000 (15:40 +0200)
committerElena Mamontova <helenh463@gmail.com>
Tue, 20 Dec 2016 13:40:02 +0000 (15:40 +0200)
1  2 
stglibs/common.lib/include/stg/common.h

index 6734a435351c4a2aa2039adeab06986c1d882c73,14ba722021c2246c5302067dfcb7a64a33aedfbe..8e82d2a84e17b099ef63a8b0ad288cc3bdc66c06
@@@ -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);