pan2 r339 - in trunk/pan: general gui tasks usenet-utils

[csk svn gnome org]

Author: csk
Date: Fri Jul  4 15:06:04 2008
New Revision: 339
URL: http://svn.gnome.org/viewvc/pan2?rev=339&view=rev

Log:
apply RH patches to get Pan compiling under F9 again.  Source: https://bugzilla.redhat.com/attachment.cgi?id=306299


Modified:
   trunk/pan/general/file-util.cc
   trunk/pan/general/line-reader.cc
   trunk/pan/general/quark.h
   trunk/pan/general/string-view.h
   trunk/pan/gui/prefs.cc
   trunk/pan/gui/score-add-ui.cc
   trunk/pan/gui/server-ui.cc
   trunk/pan/tasks/socket-impl-scripted.cc
   trunk/pan/usenet-utils/gnksa-test.cc
   trunk/pan/usenet-utils/numbers.cc

Modified: trunk/pan/general/file-util.cc
==============================================================================
--- trunk/pan/general/file-util.cc	(original)
+++ trunk/pan/general/file-util.cc	Fri Jul  4 15:06:04 2008
@@ -38,6 +38,7 @@
 #include "messages.h"
 #include "file-util.h"
 #include "utf8-utils.h"
+#include <algorithm>
 
 using namespace pan;
 

Modified: trunk/pan/general/line-reader.cc
==============================================================================
--- trunk/pan/general/line-reader.cc	(original)
+++ trunk/pan/general/line-reader.cc	Fri Jul  4 15:06:04 2008
@@ -1,6 +1,7 @@
 #include <config.h>
 #include <cstdio>
 extern "C"{ 
+  #include <stdlib.h>
   #include <glib/gi18n.h>
 }
 #include <cerrno>

Modified: trunk/pan/general/quark.h
==============================================================================
--- trunk/pan/general/quark.h	(original)
+++ trunk/pan/general/quark.h	Fri Jul  4 15:06:04 2008
@@ -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);

Modified: trunk/pan/general/string-view.h
==============================================================================
--- trunk/pan/general/string-view.h	(original)
+++ trunk/pan/general/string-view.h	Fri Jul  4 15:06:04 2008
@@ -23,6 +23,11 @@
 #include <iosfwd>
 #include <string>
 
+extern "C" 
+{
+  #include <string.h>
+}
+
 namespace pan
 {
    /**

Modified: trunk/pan/gui/prefs.cc
==============================================================================
--- trunk/pan/gui/prefs.cc	(original)
+++ trunk/pan/gui/prefs.cc	Fri Jul  4 15:06:04 2008
@@ -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>

Modified: trunk/pan/gui/score-add-ui.cc
==============================================================================
--- trunk/pan/gui/score-add-ui.cc	(original)
+++ trunk/pan/gui/score-add-ui.cc	Fri Jul  4 15:06:04 2008
@@ -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>

Modified: trunk/pan/gui/server-ui.cc
==============================================================================
--- trunk/pan/gui/server-ui.cc	(original)
+++ trunk/pan/gui/server-ui.cc	Fri Jul  4 15:06:04 2008
@@ -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>

Modified: trunk/pan/tasks/socket-impl-scripted.cc
==============================================================================
--- trunk/pan/tasks/socket-impl-scripted.cc	(original)
+++ trunk/pan/tasks/socket-impl-scripted.cc	Fri Jul  4 15:06:04 2008
@@ -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]]]");

Modified: trunk/pan/usenet-utils/gnksa-test.cc
==============================================================================
--- trunk/pan/usenet-utils/gnksa-test.cc	(original)
+++ trunk/pan/usenet-utils/gnksa-test.cc	Fri Jul  4 15:06:04 2008
@@ -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;
 

Modified: trunk/pan/usenet-utils/numbers.cc
==============================================================================
--- trunk/pan/usenet-utils/numbers.cc	(original)
+++ trunk/pan/usenet-utils/numbers.cc	Fri Jul  4 15:06:04 2008
@@ -21,6 +21,7 @@
 #include <cctype>
 #include <pan/general/string-view.h>
 #include "numbers.h"
+#include <algorithm>
 
 using namespace pan;