| 1 |
dirtyepic 08/12/04 23:58:23 |
| 2 |
|
| 3 |
Modified: fam-2.7.0-gcc43.patch |
| 4 |
Log: |
| 5 |
Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and |
| 6 |
BTree.h (bug #237953 by robs) |
| 7 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-admin/fam/files/fam-2.7.0-gcc43.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: fam-2.7.0-gcc43.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- fam-2.7.0-gcc43.patch 9 May 2008 01:41:10 -0000 1.1 |
| 23 |
+++ fam-2.7.0-gcc43.patch 4 Dec 2008 23:58:23 -0000 1.2 |
| 24 |
@@ -1,5 +1,17 @@ |
| 25 |
---- lib/Client.c++ |
| 26 |
-+++ lib/Client.c++ |
| 27 |
+diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h |
| 28 |
+--- fam-2.7.0-orig/include/BTree.h 2003-01-19 22:22:30.000000000 -0600 |
| 29 |
++++ fam-2.7.0/include/BTree.h 2008-12-04 17:51:22.000000000 -0600 |
| 30 |
+@@ -24,6 +24,7 @@ |
| 31 |
+ #define BTree_included |
| 32 |
+ |
| 33 |
+ #include "Boolean.h" |
| 34 |
++#include <cstdlib> |
| 35 |
+ |
| 36 |
+ // This is an in-core B-Tree implementation. |
| 37 |
+ // |
| 38 |
+diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++ |
| 39 |
+--- fam-2.7.0-orig/lib/Client.c++ 2003-01-18 08:18:12.000000000 -0600 |
| 40 |
++++ fam-2.7.0/lib/Client.c++ 2008-12-04 17:51:19.000000000 -0600 |
| 41 |
@@ -34,7 +34,7 @@ |
| 42 |
#include <syslog.h> |
| 43 |
#include <errno.h> |
| 44 |
@@ -9,8 +21,9 @@ |
| 45 |
|
| 46 |
#include "fam.h" |
| 47 |
#include "Client.h" |
| 48 |
---- src/DNotify.c++ |
| 49 |
-+++ src/DNotify.c++ |
| 50 |
+diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++ |
| 51 |
+--- fam-2.7.0-orig/src/DNotify.c++ 2008-12-04 17:50:48.000000000 -0600 |
| 52 |
++++ fam-2.7.0/src/DNotify.c++ 2008-12-04 17:51:19.000000000 -0600 |
| 53 |
@@ -31,6 +31,7 @@ |
| 54 |
#include <sys/types.h> |
| 55 |
#include <sys/stat.h> |
| 56 |
@@ -19,8 +32,9 @@ |
| 57 |
|
| 58 |
#include "DNotify.h" |
| 59 |
|
| 60 |
---- src/IMon.c++ |
| 61 |
-+++ src/IMon.c++ |
| 62 |
+diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++ |
| 63 |
+--- fam-2.7.0-orig/src/IMon.c++ 2003-01-18 08:18:12.000000000 -0600 |
| 64 |
++++ fam-2.7.0/src/IMon.c++ 2008-12-04 17:51:19.000000000 -0600 |
| 65 |
@@ -40,7 +40,7 @@ |
| 66 |
#include "Interest.h" |
| 67 |
#include "Log.h" |
| 68 |
@@ -30,3 +44,14 @@ |
| 69 |
|
| 70 |
int IMon::imonfd = -2; |
| 71 |
IMon::EventHandler IMon::ehandler = NULL; |
| 72 |
+diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h |
| 73 |
+--- fam-2.7.0-orig/src/Interest.h 2008-12-04 17:50:48.000000000 -0600 |
| 74 |
++++ fam-2.7.0/src/Interest.h 2008-12-04 17:51:22.000000000 -0600 |
| 75 |
+@@ -29,6 +29,7 @@ |
| 76 |
+ #include <netinet/in.h> // for in_addr |
| 77 |
+ |
| 78 |
+ #include "Boolean.h" |
| 79 |
++#include <cstdlib> |
| 80 |
+ |
| 81 |
+ class Event; |
| 82 |
+ class FileSystem; |
Archives