summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-02-07 06:06:44 +0000
committerMamoru Komachi <usata@gentoo.org>2004-02-07 06:06:44 +0000
commitbde3b1eeae8331a1b580f4335d5b8f6f744aa3a9 (patch)
treee60eb6669ba6897cb0344403a76c54f6ab69bf2a /x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
parentPPC fix. (bug #40293) (Manifest recommit) (diff)
downloadgentoo-2-bde3b1eeae8331a1b580f4335d5b8f6f744aa3a9.tar.gz
gentoo-2-bde3b1eeae8331a1b580f4335d5b8f6f744aa3a9.tar.bz2
gentoo-2-bde3b1eeae8331a1b580f4335d5b8f6f744aa3a9.zip
Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599
Diffstat (limited to 'x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff')
-rw-r--r--x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff26
1 files changed, 18 insertions, 8 deletions
diff --git a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
index b58c09d1f77b..d6f9e5cee3dd 100644
--- a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
+++ b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
@@ -1,14 +1,23 @@
---- gram.y-orig 2001-12-11 16:38:52.000000000 +0100
-+++ gram.y 2003-05-08 13:11:55.000000000 +0200
-@@ -427,6 +427,7 @@
-
+diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
+--- ctwm-3.6.ORIG/gram.y 2001-12-12 00:38:52.000000000 +0900
++++ ctwm-3.6/gram.y 2004-02-07 06:43:37.067787401 +0900
+@@ -419,14 +419,13 @@
+ | WINDOW_RING { list = &Scr->WindowRingL; }
+ win_list
+ | WINDOW_RING { Scr->WindowRingAll = TRUE; }
+- ;
+ | WINDOW_RING_EXCLUDE { if (!Scr->WindowRingL)
+ Scr->WindowRingAll = TRUE;
+ list = &Scr->WindowRingExcludeL; }
+ win_list
+-
| WINDOW_GEOMETRIES { }
wingeom_list
+ ;
noarg : KEYWORD { if (!do_single_keyword ($1)) {
twmrc_error_prefix();
-@@ -683,8 +684,8 @@
+@@ -683,8 +682,8 @@
| wingeom_entries wingeom_entry
;
@@ -19,7 +28,7 @@
squeeze : SQUEEZE_TITLE {
-@@ -835,6 +836,7 @@
+@@ -835,6 +834,7 @@
AddToClientsList ($1, client);
}
@@ -27,7 +36,7 @@
occupy_window_list : LB occupy_window_entries RB {}
;
-@@ -845,7 +847,7 @@
+@@ -845,7 +845,7 @@
occupy_window_entry : string {
AddToClientsList (workspace, $1);
}
@@ -36,10 +45,11 @@
icon_list : LB icon_entries RB {}
;
-@@ -962,6 +964,7 @@
+@@ -962,6 +962,7 @@
RemoveDQuote(ptr);
$$ = (unsigned char*)ptr;
}
+ ;
number : NUMBER { $$ = $1; }
;
+