summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-02-15 20:47:41 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-02-15 20:47:41 +0000
commitdf9ff0d4647fc3ad1bc759f72acbcd8f5fcc57ad (patch)
tree3bd28747b64cfb39545a5cb1162740694ab3e5c5 /net-fs/fex/files
parentEAPI=2 (diff)
downloadhistorical-df9ff0d4647fc3ad1bc759f72acbcd8f5fcc57ad.tar.gz
historical-df9ff0d4647fc3ad1bc759f72acbcd8f5fcc57ad.tar.bz2
historical-df9ff0d4647fc3ad1bc759f72acbcd8f5fcc57ad.zip
Update gcc4 patch with fixes for gcc-4.3. Bug 241444. Thanks to Gene Seto <geneseto@hotmail.com> for the patch.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'net-fs/fex/files')
-rw-r--r--net-fs/fex/files/fex-0.8.18-gcc4.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/net-fs/fex/files/fex-0.8.18-gcc4.patch b/net-fs/fex/files/fex-0.8.18-gcc4.patch
index 00147faaea6f..101c78a1a618 100644
--- a/net-fs/fex/files/fex-0.8.18-gcc4.patch
+++ b/net-fs/fex/files/fex-0.8.18-gcc4.patch
@@ -97,3 +97,62 @@ diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp
}
+diff -rupN fex-0.8.18b/src/modlog.cpp fex-0.8.18/src/modlog.cpp
+--- fex-0.8.18b/src/modlog.cpp 2009-01-22 17:00:41.000000000 -0400
++++ fex-0.8.18/src/modlog.cpp 2009-01-22 17:03:44.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <cstdlib>
+ extern "C" {
+ #include <librsync.h>
+ }
+diff -rupN fex-0.8.18b/src/modlog.h fex-0.8.18/src/modlog.h
+--- fex-0.8.18b/src/modlog.h 2009-01-22 17:00:41.000000000 -0400
++++ fex-0.8.18/src/modlog.h 2009-01-22 17:01:44.000000000 -0400
+@@ -22,7 +22,7 @@
+ #ifndef MODLOG_H
+ #define MODLOG_H
+
+-#include <string>
++#include <cstring>
+ #include <map>
+
+
+diff -rupN fex-0.8.18b/src/nmstl/status fex-0.8.18/src/nmstl/status
+--- fex-0.8.18b/src/nmstl/status 2009-01-22 17:00:41.000000000 -0400
++++ fex-0.8.18/src/nmstl/status 2009-01-22 17:02:12.000000000 -0400
+@@ -23,7 +23,7 @@
+ #ifndef NMSTL_H_STATUS
+ #define NMSTL_H_STATUS
+
+-#include <string>
++#include <cstring>
+ #include <nmstl/internal.h>
+
+ NMSTL_NAMESPACE_BEGIN;
+diff -rupN fex-0.8.18b/src/nmstl_src/debug.cc fex-0.8.18/src/nmstl_src/debug.cc
+--- fex-0.8.18b/src/nmstl_src/debug.cc 2009-01-22 17:00:41.000000000 -0400
++++ fex-0.8.18/src/nmstl_src/debug.cc 2009-01-22 17:04:16.000000000 -0400
+@@ -20,7 +20,8 @@
+ *
+ */
+
+-#include <iostream>
++#include <cstdlib>
++#include <cstring>
+
+ #include <nmstl/debug>
+ #include <nmstl/thread>
+diff -rupN fex-0.8.18b/src/nmstl_src/internal.cc fex-0.8.18/src/nmstl_src/internal.cc
+--- fex-0.8.18b/src/nmstl_src/internal.cc 2009-01-22 17:00:41.000000000 -0400
++++ fex-0.8.18/src/nmstl_src/internal.cc 2009-01-22 17:04:45.000000000 -0400
+@@ -21,6 +21,7 @@
+ */
+
+ #include <nmstl/internal.h>
++#include <cstdlib>
+
+ #undef NMSTL_DEBUG_FILE_H
+ #define NMSTL_DEBUG_FILE_H "nmstl/internal"