diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2003-11-01 07:47:22 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2003-11-01 07:47:22 +0000 |
| commit | d242f8df42d991db261a151d3b55e1e1ce430b65 (patch) | |
| tree | ddd9e72ec3ab1591785e1bef0304fcfb68ac37f3 /x11-wm/fvwm95 | |
| parent | Upgrade to 8.0.5 (minor bugfixes). (diff) | |
. Unbreak compilation on 5.x (gcc 3.3).
PR: 58719
Submitted by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Notes
Notes:
svn path=/head/; revision=92769
Diffstat (limited to 'x11-wm/fvwm95')
| -rw-r--r-- | x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c b/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c new file mode 100644 index 000000000000..ff022d3d9f69 --- /dev/null +++ b/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c @@ -0,0 +1,36 @@ +$FreeBSD$ + +--- modules/FvwmIconMan/FvwmIconMan.c.orig Thu Oct 30 12:53:01 2003 ++++ modules/FvwmIconMan/FvwmIconMan.c Thu Oct 30 13:10:36 2003 +@@ -315,6 +315,23 @@ + return copy_string (s1, s2); + } + ++#if __GNUC__ > 2 ++#define SET_MANAGER(manager,field,value) \ ++ do { \ ++ int id = manager; \ ++ if (id == -1) { \ ++ for (id = 0; id < globals.num_managers; id++) { \ ++ globals.managers[id].field = value; \ ++ } \ ++ } \ ++ else if (id < globals.num_managers) { \ ++ globals.managers[id].field = value; \ ++ } \ ++ else { \ ++ ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \ ++ } \ ++ } while (0) ++#else + #define SET_MANAGER(manager,field,value) \ + do { \ + int id = manager; \ +@@ -330,6 +347,7 @@ + ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \ + } \ + } while (0) ++#endif /* GCC 2 */ + + static void read_in_resources (char *file) + { |