File wvstreams-gcc43.patch of Package wvstreams

Overview Repositories Revisions Requests Users Attributes Meta

File wvstreams-gcc43.patch of Package wvstreams

Index: include/wvserialize.h
===================================================================
--- include/wvserialize.h.orig
+++ include/wvserialize.h
@@ -348,8 +348,8 @@ template <>
  * (zero) character.  Serialized WvStrings are guaranteed not to contain nul
  * except as the last character.
  */
-template <>
-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
+//template <>
+//extern WvString _wv_deserialize<WvString>(WvBuf &buf);
 
 
 /** Deserialize a WvBuf. */
Index: include/uniconfkey.h
===================================================================
--- include/uniconfkey.h.orig
+++ include/uniconfkey.h
@@ -9,7 +9,7 @@
 
 #include "wvstring.h"
 #include "wvlinklist.h"
-
+#include <limits.h>
 
 // The Python headers try to #define ANY as void.  If we're building Python
 // wrappers, get rid of that.
Index: utils/strutils.cc
===================================================================
--- utils/strutils.cc.orig
+++ utils/strutils.cc
@@ -305,7 +305,7 @@ WvString web_unescape(const char *str, b
 {
     const char *iptr;
     char *optr;
-    char *idx1, *idx2;
+    const char *idx1, *idx2;
     static const char hex[] = "0123456789ABCDEF";
     WvString in, intmp(str), out;
  
@@ -952,7 +952,7 @@ WvString afterstr(WvStringParm line, WvS
     if (!line || !a)
 	return WvString::null;
 
-    char *loc = strstr(line, a);
+    const char *loc = strstr(line, a);
     if (loc == 0)
 	return "";
 
@@ -970,7 +970,7 @@ WvString beforestr(WvStringParm line, Wv
 
     WvString ret = line;
     ret.unique();     
-    char *loc = strstr(ret, a);
+    char *loc = (char*)strstr(ret, a);
 
     if (loc == 0)
 	return line;
Index: utils/verstring.cc
===================================================================
--- utils/verstring.cc.orig
+++ utils/verstring.cc
@@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver)
 
 bool is_new_verstr(const char *str)
 {
-    char *p = strchr(str, '.');
+    const char *p = strchr(str, '.');
     if (p && strchr(p+1, '.'))
         return true;
 
Index: ipstreams/wvaddr.cc
===================================================================
--- ipstreams/wvaddr.cc.orig
+++ ipstreams/wvaddr.cc
@@ -537,7 +537,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net)
 // If the netmask is not specified, it will default to all 1's.
 void WvIPNet::string_init(const char string[])
 {
-    char *maskptr;
+    const char *maskptr;
     int bits;
     uint32_t imask;

Places

File wvstreams-gcc43.patch of Package wvstreams

Places