Fix build with gcc41 on amd64

3 files changed, 69 insertions, 0 deletions

diff --git a/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp b/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp
new file mode 100644
index 000000000000..334f36ccd949
--- /dev/null
+++ b/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp
@@ -0,0 +1,20 @@
+--- goldlib/gall/gmemdbg.cpp.orig	Fri Feb 23 05:34:31 2007
++++ goldlib/gall/gmemdbg.cpp	Fri Feb 23 05:35:12 2007
+@@ -193,7 +193,7 @@
+   long last_diff = LONG_MAX;
+   Throw** i = throw_index;
+   for(int n=0; n<throw_index_size; n++,i++) {
+-    long diff = (uint32_t)*i - (uint32_t)pointer;
++    long diff = (long)*i - (long)pointer;
+     if((diff > 0) and (diff < last_diff)) {
+       last_candidate = *i;
+       last_diff = diff;
+@@ -211,7 +211,7 @@
+   long last_diff = LONG_MAX;
+   Throw** i = throw_index;
+   for(int n=0; n<throw_index_size; n++,i++) {
+-    long diff = (uint32_t)pointer - (uint32_t)*i;
++    long diff = (long)pointer - (long)*i;
+     if((diff > 0) and (diff < last_diff)) {
+       last_candidate = *i;
+       last_diff = diff;
diff --git a/news/golded+/files/patch-goldlib-hunspell-csutil.cxx b/news/golded+/files/patch-goldlib-hunspell-csutil.cxx
new file mode 100644
index 000000000000..0abe4bec6868
--- /dev/null
+++ b/news/golded+/files/patch-goldlib-hunspell-csutil.cxx
@@ -0,0 +1,29 @@
+--- goldlib/hunspell/csutil.cxx.orig	Fri Feb 23 05:38:36 2007
++++ goldlib/hunspell/csutil.cxx	Fri Feb 23 05:40:11 2007
+@@ -4942,7 +4942,7 @@
+ */
+ int get_utf_cs_len()
+ {
+-  return (int)get_utf_cs(false);
++  return (long)get_utf_cs(false);
+ }
+ 
+ static struct lang_map *get_lang2enc(bool what = true)
+@@ -4980,7 +4980,7 @@
+ 
+ const char * get_default_enc(const char * lang)
+ {
+-  int n = (int)get_lang2enc(false);
++  int n = (long)get_lang2enc(false);
+   for (int i = 0; i < n; i++)
+   {
+     if (strcmp(lang, get_lang2enc()[i].lang) == 0)
+@@ -4993,7 +4993,7 @@
+ 
+ int get_lang_num(const char * lang)
+ {
+-  int n = (int)get_lang2enc(false);
++  int n = (long)get_lang2enc(false);
+   for (int i = 0; i < n; i++)
+   {
+     if (strncmp(lang,get_lang2enc()[i].lang,2) == 0)
diff --git a/news/golded+/files/patch-goldnode-goldnode.cpp b/news/golded+/files/patch-goldnode-goldnode.cpp
new file mode 100644
index 000000000000..f55981d272ef
--- /dev/null
+++ b/news/golded+/files/patch-goldnode-goldnode.cpp
@@ -0,0 +1,20 @@
+--- goldnode/goldnode.cpp.orig	Fri Feb 23 05:44:33 2007
++++ goldnode/goldnode.cpp	Fri Feb 23 05:45:36 2007
+@@ -259,7 +259,7 @@
+   point = strchr(str, '.');
+   domain = strchr(str, '@');
+   if(domain and point)
+-    if((uint32_t)point > (uint32_t)domain)
++    if(point > domain)
+       point = NULL;
+ 
+   if(space)
+@@ -304,7 +304,7 @@
+     char* point = strchr(str, '.');
+     domain = strchr(str, '@');
+     if(domain and point)
+-      if((uint32_t)point > (uint32_t)domain)
++      if(point > domain)
+         point = NULL;
+ 
+     if(net) {