SOURCES (DEVEL): cvsnt-ipvflags.patch - ipversion should be defined in cvsa...

[pawelz]

Author: pawelz                       Date: Fri Dec 19 20:34:04 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- ipversion should be defined in cvsapi library
- declare it as extern outside the cvsapi library
- NFY

---- Files affected:
SOURCES:
   cvsnt-ipvflags.patch (1.2.2.1 -> 1.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/cvsnt-ipvflags.patch
diff -u SOURCES/cvsnt-ipvflags.patch:1.2.2.1 SOURCES/cvsnt-ipvflags.patch:1.2.2.2
--- SOURCES/cvsnt-ipvflags.patch:1.2.2.1	Thu Dec 18 19:49:04 2008
+++ SOURCES/cvsnt-ipvflags.patch	Fri Dec 19 21:33:58 2008
@@ -1,15 +1,15 @@
-diff -Naur cvsnt-2.5.04.3236.orig/cvsapi/SocketIO.h cvsnt-2.5.04.3236.ipvflags/cvsapi/SocketIO.h
---- cvsnt-2.5.04.3236.orig/cvsapi/SocketIO.h	2005-10-02 16:45:54.000000000 +0200
-+++ cvsnt-2.5.04.3236.ipvflags/cvsapi/SocketIO.h	2008-12-08 11:20:44.000000000 +0100
-@@ -37,6 +37,8 @@
- 
- typedef cvs::smartptr<CSocketIO> CSocketIOPtr;
- 
-+extern int ipversion;
-+
- class CSocketIO
- {
- public:
+# diff -Naur cvsnt-2.5.04.3236.orig/cvsapi/SocketIO.h cvsnt-2.5.04.3236.ipvflags/cvsapi/SocketIO.h
+# --- cvsnt-2.5.04.3236.orig/cvsapi/SocketIO.h	2005-10-02 16:45:54.000000000 +0200
+# +++ cvsnt-2.5.04.3236.ipvflags/cvsapi/SocketIO.h	2008-12-08 11:20:44.000000000 +0100
+# @@ -37,6 +37,8 @@
+#  
+#  typedef cvs::smartptr<CSocketIO> CSocketIOPtr;
+#  
+# +int ipversion;
+# +
+#  class CSocketIO
+#  {
+#  public:
 diff -Naur cvsnt-2.5.04.3236.orig/cvsapi/unix/SocketIO.cpp cvsnt-2.5.04.3236.ipvflags/cvsapi/unix/SocketIO.cpp
 --- cvsnt-2.5.04.3236.orig/cvsapi/unix/SocketIO.cpp	2008-12-07 01:16:34.000000000 +0100
 +++ cvsnt-2.5.04.3236.ipvflags/cvsapi/unix/SocketIO.cpp	2008-12-08 11:21:31.000000000 +0100
@@ -124,7 +124,7 @@
  
 +/* This global variable is set to 4 or 6 if user requested ipv4 or ipv6 or
 + * zero otherwise */
-+int ipversion = 0;
++extern int ipversion = 0;
 +
  /* An buffer interface.  This is built on top of a
     packetizing buffer.  */
@@ -135,7 +135,7 @@
  
  typedef std::map<std::string,std::string> VersionMapType;
  
-+int ipversion = 0;
++extern int ipversion = 0;
 +
  #ifdef _WIN32
  CRITICAL_SECTION g_crit;
@@ -146,8 +146,19 @@
  CSqlConnectionInformation *g_pCI;
  char g_engine[64];
  
-+int ipversion = 0;
++extern int ipversion = 0;
 +
  // Old->New mapping
  static const char *const dbList[] =
  {
+--- cvsnt-2.5.05.3240/cvsapi/unix/SocketIO.cpp~	2008-12-19 20:59:52.693650080 +0100
++++ cvsnt-2.5.05.3240/cvsapi/unix/SocketIO.cpp	2008-12-19 21:08:28.727973161 +0100
+@@ -46,6 +46,8 @@
+ # define PATCH_NULL(x) x
+ #endif
+ 
++int ipversion = 0;
++
+ CSocketIO::CSocketIO()
+ {
+ 	m_pAddrInfo=NULL;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvsnt-ipvflags.patch?r1=1.2.2.1&r2=1.2.2.2&f=u