Connection notifier and watcher added

[stg.git] / stglibs / common.lib / common.h

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index 904c6e470ed5b5f2be7cc030ac060564e5d74f62..3752822aa728a067481c810d3c9ed3fa99a0314a 100644 (file)
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -19,19 +19,23 @@
  */
 
  /*
  */
 
  /*

- $Revision: 1.31 $
- $Date: 2010/11/03 10:26:30 $
+ $Revision: 1.32 $
+ $Date: 2010/11/08 10:11:19 $

  $Author: faust $
  */
 
 #ifndef common_h
 #define common_h
 
  $Author: faust $
  */
 
 #ifndef common_h
 #define common_h
 

+#ifdef __BORLANDC__
+#include <time.h>
+#else

 #include <ctime>
 #include <ctime>

+#endif

 #include <string>
 
 #include <string>
 

-#include "os_int.h"
-#include "stg_const.h"
+#include "stg/os_int.h"
+#include "stg/const.h"

 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)
 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)


@@ -217,10 +221,13 @@ int str2x(const std::string & str, int & x);
 int str2x(const std::string & str, unsigned & x);
 int str2x(const std::string & str, long & x);
 int str2x(const std::string & str, unsigned long & x);
 int str2x(const std::string & str, unsigned & x);
 int str2x(const std::string & str, long & x);
 int str2x(const std::string & str, unsigned long & x);

+#ifndef WIN32

 int str2x(const std::string & str, long long & x);
 int str2x(const std::string & str, unsigned long long & x);
 int str2x(const std::string & str, long long & x);
 int str2x(const std::string & str, unsigned long long & x);

+#endif

 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);
 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);

+const std::string & x2str(unsigned long x, std::string & s);

 const std::string & x2str(unsigned long long x, std::string & s);
 //-----------------------------------------------------------------------------
 char * stg_strptime(const char *, const char *, struct tm *);
 const std::string & x2str(unsigned long long x, std::string & s);
 //-----------------------------------------------------------------------------
 char * stg_strptime(const char *, const char *, struct tm *);