Attachment 306299 Details for Bug 433970 – Proposed patch to fix the compilation

[patch] Proposed patch to fix the compilation

pan-0.132.includes.patch (text/plain), 5.15 KB, created by Pavel Polischouk on 2008-05-21 18:44:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Polischouk

Created: 2008-05-21 18:44:35 UTC

Size: 5.15 KB

patch

obsolete

>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/data-impl/my-tree.cc pan-0.132/pan/data-impl/my-tree.cc
>--- pan-0.132.old/pan/data-impl/my-tree.cc	2007-08-01 13:00:00.000000000 -0400
>+++ pan-0.132/pan/data-impl/my-tree.cc	2008-05-16 12:28:42.000000000 -0400
>@@ -19,7 +19,7 @@
> 
> #include <config.h>
> #include <cassert>
>-#include <glib/gmessages.h> // for g_assert
>+#include <glib/gtestutils.h> // for g_assert
> #include <pan/general/debug.h>
> #include <pan/general/foreach.h>
> #include <pan/general/quark.h>
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/general/file-util.cc pan-0.132/pan/general/file-util.cc
>--- pan-0.132.old/pan/general/file-util.cc	2007-08-01 13:00:01.000000000 -0400
>+++ pan-0.132/pan/general/file-util.cc	2008-05-16 12:13:36.000000000 -0400
>@@ -38,6 +38,7 @@
> #include "messages.h"
> #include "file-util.h"
> #include "utf8-utils.h"
>+#include <algorithm>
> 
> using namespace pan;
> 
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/general/line-reader.cc pan-0.132/pan/general/line-reader.cc
>--- pan-0.132.old/pan/general/line-reader.cc	2007-08-01 13:00:01.000000000 -0400
>+++ pan-0.132/pan/general/line-reader.cc	2008-05-16 12:13:41.000000000 -0400
>@@ -1,6 +1,7 @@
> #include <config.h>
> #include <cstdio>
> extern "C"{ 
>+  #include <stdlib.h>
>   #include <glib/gi18n.h>
> }
> #include <cerrno>
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/general/quark.h pan-0.132/pan/general/quark.h
>--- pan-0.132.old/pan/general/quark.h	2007-08-01 13:00:01.000000000 -0400
>+++ pan-0.132/pan/general/quark.h	2008-05-16 12:16:43.000000000 -0400
>@@ -40,6 +40,9 @@
> #endif
> 
> #define get16bits(d) (*((const uint16_t *) (d)))
>+extern "C"{ 
>+  #include <string.h>
>+}
> 
> namespace pan
> {
>@@ -231,7 +234,7 @@
>       if (a.empty() && b.empty()) return false;
>       if (a.empty()) return true;
>       if (b.empty()) return false;
>-      return std::strcmp (a.c_str(), b.c_str()) < 0;
>+      return ::strcmp (a.c_str(), b.c_str()) < 0;
>     }
>     bool operator() (const Quark* a, const Quark* b) const {
>       return (*this) (*a, *b);
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/general/string-view.h pan-0.132/pan/general/string-view.h
>--- pan-0.132.old/pan/general/string-view.h	2007-08-01 13:00:01.000000000 -0400
>+++ pan-0.132/pan/general/string-view.h	2008-05-16 12:08:00.000000000 -0400
>@@ -23,6 +23,11 @@
> #include <iosfwd>
> #include <string>
> 
>+extern "C" 
>+{
>+  #include <string.h>
>+}
>+
> namespace pan
> {
>    /**
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/gui/prefs.cc pan-0.132/pan/gui/prefs.cc
>--- pan-0.132.old/pan/gui/prefs.cc	2007-08-01 13:00:00.000000000 -0400
>+++ pan-0.132/pan/gui/prefs.cc	2008-05-16 12:31:02.000000000 -0400
>@@ -25,6 +25,7 @@
> extern "C" {
>   #include <glib.h>
>   #include <glib/gi18n.h>
>+  #include <stdlib.h>
> }
> #include <pan/general/debug.h>
> #include <pan/general/foreach.h>
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/gui/score-add-ui.cc pan-0.132/pan/gui/score-add-ui.cc
>--- pan-0.132.old/pan/gui/score-add-ui.cc	2007-08-01 13:00:00.000000000 -0400
>+++ pan-0.132/pan/gui/score-add-ui.cc	2008-05-16 12:21:39.000000000 -0400
>@@ -21,6 +21,7 @@
> #include <cassert>
> extern "C" {
>   #include <glib/gi18n.h>
>+  #include "limits.h"
> }
> #include <pan/general/debug.h>
> #include <pan/general/text-match.h>
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/gui/server-ui.cc pan-0.132/pan/gui/server-ui.cc
>--- pan-0.132.old/pan/gui/server-ui.cc	2007-08-01 13:00:00.000000000 -0400
>+++ pan-0.132/pan/gui/server-ui.cc	2008-05-16 12:21:39.000000000 -0400
>@@ -24,6 +24,7 @@
>   #include <glib.h>
>   #include <glib/gi18n.h>
>   #include <gtk/gtk.h>
>+  #include "limits.h"
> }
> #include <pan/general/foreach.h>
> #include <pan/general/quark.h>
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/tasks/socket-impl-scripted.cc pan-0.132/pan/tasks/socket-impl-scripted.cc
>--- pan-0.132.old/pan/tasks/socket-impl-scripted.cc	2007-08-01 13:00:00.000000000 -0400
>+++ pan-0.132/pan/tasks/socket-impl-scripted.cc	2008-05-16 12:24:01.000000000 -0400
>@@ -24,6 +24,11 @@
> #include <pan/general/string-view.h>
> #include "socket-impl-scripted.h"
> 
>+extern "C"
>+{
>+  #include "stdlib.h"
>+}
>+
> using namespace pan;
> 
> const std::string ScriptedSocket::ABORT ("[[[ABORT]]]");
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/usenet-utils/gnksa-test.cc pan-0.132/pan/usenet-utils/gnksa-test.cc
>--- pan-0.132.old/pan/usenet-utils/gnksa-test.cc	2007-08-01 12:59:59.000000000 -0400
>+++ pan-0.132/pan/usenet-utils/gnksa-test.cc	2008-05-16 12:21:39.000000000 -0400
>@@ -4,6 +4,10 @@
> #include <pan/general/string-view.h>
> #include <pan/general/test.h>
> #include "gnksa.h"
>+extern "C"
>+{
>+  #include "limits.h"
>+}
> 
> using namespace pan;
> 
>diff -ur --exclude 'config*' --exclude '*desktop' pan-0.132.old/pan/usenet-utils/numbers.cc pan-0.132/pan/usenet-utils/numbers.cc
>--- pan-0.132.old/pan/usenet-utils/numbers.cc	2007-08-01 12:59:59.000000000 -0400
>+++ pan-0.132/pan/usenet-utils/numbers.cc	2008-05-16 12:19:18.000000000 -0400
>@@ -21,6 +21,7 @@
> #include <cctype>
> #include <pan/general/string-view.h>
> #include "numbers.h"
>+#include <algorithm>
> 
> using namespace pan;
>

Actions: View | Diff

Attachments on bug 433970: 306299