* rebased llvm/hotfix-sparcv9-not-64.diff
[t2sde.git] / package / filesystem / fam / hotfix-gcc43.patch
blob715651d2c81d2fc0d9ea7e76a18cdede452f45c7
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../fam/gcc43.patch
5 # Copyright (C) 2008 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
17 --- ./lib/Client.c++
18 +++ ./lib/Client.c++
19 @@ -34,7 +34,7 @@
20 #include <syslog.h>
21 #include <errno.h>
23 -#include <iostream.h>
24 +#include <iostream>
26 #include "fam.h"
27 #include "Client.h"
28 --- ./src/DNotify.c++
29 +++ ./src/DNotify.c++
30 @@ -31,6 +31,7 @@
31 #include <sys/types.h>
32 #include <sys/stat.h>
33 #include <libgen.h>
34 +#include <cstdlib>
36 #include "DNotify.h"
38 --- ./src/IMon.c++
39 +++ ./src/IMon.c++
40 @@ -40,7 +40,7 @@
41 #include "Interest.h"
42 #include "Log.h"
43 #include "Scheduler.h"
44 -#include "alloc.h"
45 +#include <memory>
47 int IMon::imonfd = -2;
48 IMon::EventHandler IMon::ehandler = NULL;
49 --- ./src/DNotify.h.old 2008-08-25 15:27:30.000000000 +0200
50 +++ ./src/DNotify.h 2008-08-25 15:30:19.000000000 +0200
51 @@ -59,8 +59,8 @@
52 static int pipe_write_fd;
53 static int pipe_read_fd;
54 static int change_queue[QUEUESIZE];
55 - static volatile sig_atomic_t DNotify::queue_overflowed;
56 - static volatile sig_atomic_t DNotify::queue_changed;
57 + static volatile sig_atomic_t queue_overflowed;
58 + static volatile sig_atomic_t queue_changed;
59 static volatile int queue_head; // Only modified by read handler
60 static volatile int queue_tail; // Only modified by signal handler
61 static EventHandler ehandler;