[gentoo-commits] gentoo-x86 commit in app-admin/fam/files: fam-2.7.0-gcc43.patch

[gentoo-commits] gentoo-x86 commit in app-admin/fam/files: fam-2.7.0-gcc43.patch

[Mark Loeser (halcy0n)]

halcy0n     08/05/09 01:41:11

  Added:                fam-2.7.0-gcc43.patch
  Log:
  Patch to fix building with gcc-4.3 by Martin Väth <vaeth AT mathematik.uni-wuerzburg DOT de>; bug #215475
  (Portage version: 2.1.5_rc7)

Revision  Changes    Path
1.1                  app-admin/fam/files/fam-2.7.0-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.1&content-type=text/plain

Index: fam-2.7.0-gcc43.patch
===================================================================
--- lib/Client.c++
+++ lib/Client.c++
@@ -34,7 +34,7 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <iostream.h>
+#include <iostream>
 
 #include "fam.h"
 #include "Client.h"
--- src/DNotify.c++
+++ src/DNotify.c++
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <libgen.h>
+#include <cstdlib>
 
 #include "DNotify.h"
 
--- src/IMon.c++
+++ src/IMon.c++
@@ -40,7 +40,7 @@
 #include "Interest.h"
 #include "Log.h"
 #include "Scheduler.h"
-#include "alloc.h"
+#include <memory>
 
 int		   IMon::imonfd = -2;
 IMon::EventHandler IMon::ehandler = NULL;



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in app-admin/fam/files: fam-2.7.0-gcc43.patch

[Ryan Hill (dirtyepic)]

dirtyepic    08/12/04 23:58:23

  Modified:             fam-2.7.0-gcc43.patch
  Log:
  Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and
  BTree.h (bug #237953 by robs)
  (Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)

Revision  Changes    Path
1.2                  app-admin/fam/files/fam-2.7.0-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?r1=1.1&r2=1.2

Index: fam-2.7.0-gcc43.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fam-2.7.0-gcc43.patch	9 May 2008 01:41:10 -0000	1.1
+++ fam-2.7.0-gcc43.patch	4 Dec 2008 23:58:23 -0000	1.2
@@ -1,5 +1,17 @@
---- lib/Client.c++
-+++ lib/Client.c++
+diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h
+--- fam-2.7.0-orig/include/BTree.h	2003-01-19 22:22:30.000000000 -0600
++++ fam-2.7.0/include/BTree.h	2008-12-04 17:51:22.000000000 -0600
+@@ -24,6 +24,7 @@
+ #define BTree_included
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ //  This is an in-core B-Tree implementation.
+ //
+diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
+--- fam-2.7.0-orig/lib/Client.c++	2003-01-18 08:18:12.000000000 -0600
++++ fam-2.7.0/lib/Client.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -34,7 +34,7 @@
  #include <syslog.h>
  #include <errno.h>
@@ -9,8 +21,9 @@
  
  #include "fam.h"
  #include "Client.h"
---- src/DNotify.c++
-+++ src/DNotify.c++
+diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0-orig/src/DNotify.c++	2008-12-04 17:50:48.000000000 -0600
++++ fam-2.7.0/src/DNotify.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -31,6 +31,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -19,8 +32,9 @@
  
  #include "DNotify.h"
  
---- src/IMon.c++
-+++ src/IMon.c++
+diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
+--- fam-2.7.0-orig/src/IMon.c++	2003-01-18 08:18:12.000000000 -0600
++++ fam-2.7.0/src/IMon.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -40,7 +40,7 @@
  #include "Interest.h"
  #include "Log.h"
@@ -30,3 +44,14 @@
  
  int		   IMon::imonfd = -2;
  IMon::EventHandler IMon::ehandler = NULL;
+diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h
+--- fam-2.7.0-orig/src/Interest.h	2008-12-04 17:50:48.000000000 -0600
++++ fam-2.7.0/src/Interest.h	2008-12-04 17:51:22.000000000 -0600
+@@ -29,6 +29,7 @@
+ #include <netinet/in.h>  //  for in_addr
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ class Event;
+ class FileSystem;