diff options
| author | jhb <jhb@FreeBSD.org> | 2002-10-16 23:49:57 +0800 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-10-16 23:49:57 +0800 |
| commit | 790a25f2ea0642efc9b60b12e3c8bc9ca324292c (patch) | |
| tree | 7c9bfea202ca832bebd1d460b664175fca55013f | |
| parent | c31f4dbc186f2e322cffecbd8278a04a11459620 (diff) | |
| download | freebsd-ports-gnome-790a25f2ea0642efc9b60b12e3c8bc9ca324292c.tar.gz freebsd-ports-gnome-790a25f2ea0642efc9b60b12e3c8bc9ca324292c.tar.zst freebsd-ports-gnome-790a25f2ea0642efc9b60b12e3c8bc9ca324292c.zip | |
Get this to compile with gcc 3.x on -current. Mostly consists of moving
this to ANSI C++.
Approved by: mikeh (maintainer)
| -rw-r--r-- | mail/xfmail/files/patch-ac | 15 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-ad | 14 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-ae | 15 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-af | 11 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-ag | 11 |
5 files changed, 66 insertions, 0 deletions
diff --git a/mail/xfmail/files/patch-ac b/mail/xfmail/files/patch-ac new file mode 100644 index 000000000000..ae3bcbc6731e --- /dev/null +++ b/mail/xfmail/files/patch-ac @@ -0,0 +1,15 @@ +--- src/mail/cfgfile.h.orig Tue Oct 15 17:29:47 2002 ++++ src/mail/cfgfile.h Tue Oct 15 16:51:06 2002 +@@ -30,8 +30,10 @@ + + #include <config.h> + +-#include <iostream.h> +-#include <fstream.h> ++using namespace std; ++ ++#include <iostream> ++#include <fstream> + #include <assert.h> + #include <map> + #include <string> diff --git a/mail/xfmail/files/patch-ad b/mail/xfmail/files/patch-ad new file mode 100644 index 000000000000..aee644a03de0 --- /dev/null +++ b/mail/xfmail/files/patch-ad @@ -0,0 +1,14 @@ +--- src/mail/connection.cpp.orig Tue Oct 15 17:32:03 2002 ++++ src/mail/connection.cpp Tue Oct 15 16:56:49 2002 +@@ -25,9 +25,9 @@ + * * + ******************************************************************************/ + ++using namespace std; + +- +-#include <iostream.h> ++#include <iostream> + #include <list> + #include <string> + #include <string.h> diff --git a/mail/xfmail/files/patch-ae b/mail/xfmail/files/patch-ae new file mode 100644 index 000000000000..42f60480b7cf --- /dev/null +++ b/mail/xfmail/files/patch-ae @@ -0,0 +1,15 @@ +--- src/mail/debug.cpp.orig Tue Oct 15 17:32:57 2002 ++++ src/mail/debug.cpp Tue Oct 15 16:59:15 2002 +@@ -25,9 +25,12 @@ + * * + ******************************************************************************/ + ++using namespace std; ++ + #include <glib.h> + #include <debug.h> + #include <fmail.h> ++#include <iostream> + + #if STDC_HEADERS || defined(USE_STDARG) + void _debugpf(char *fmt, ...) diff --git a/mail/xfmail/files/patch-af b/mail/xfmail/files/patch-af new file mode 100644 index 000000000000..92516f71b4ba --- /dev/null +++ b/mail/xfmail/files/patch-af @@ -0,0 +1,11 @@ +--- src/mail/fmail.h.orig Tue Oct 15 17:34:06 2002 ++++ src/mail/fmail.h Tue Oct 15 16:54:32 2002 +@@ -47,6 +47,8 @@ + #include <config.h> + #endif + ++ using namespace std; ++ + #include <vector> + #include <list> + #include <stdio.h> diff --git a/mail/xfmail/files/patch-ag b/mail/xfmail/files/patch-ag new file mode 100644 index 000000000000..06d9fca57ee0 --- /dev/null +++ b/mail/xfmail/files/patch-ag @@ -0,0 +1,11 @@ +--- src/ui/rules.cpp.orig Tue Oct 15 17:35:07 2002 ++++ src/ui/rules.cpp Tue Oct 15 17:22:11 2002 +@@ -366,7 +366,7 @@ + r_modified = 0; + fl_delete_browser_line(rule_obj->Rule_List, k); + add_dead_rule(rules[i]); +- rules.erase(&rules[i]); ++ rules.erase(rules.begin() + i); + + changed = 1; + |