summaryrefslogtreecommitdiff
path: root/sys-fs/lde/files/lde-2.6.1-no-shadowing.patch
blob: 586bbf3e876839873e8e63f85c546ee9375ccb99 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
rename daylight to avoid shadowing the daylight function and pissing off gcc

http://bugs.gentoo.org/141881

--- lde/src/swiped/cnews/getdate.y
+++ lde/src/swiped/cnews/getdate.y
@@ -24,7 +24,7 @@
 
 	static int timeflag, dateflag, dayflag, relflag;
 	static time_t relsec, relmonth;
-	static int hh, mm, ss, merid, daylight;
+	static int hh, mm, ss, merid, foo_daylight;
 	static int dayord, dayreq;
 	static int month, day, year;
 	static int ourzone;
@@ -68,19 +68,19 @@
 		{hh = $1; mm = $3; merid = $4;}
 	| NUMBER ':' NUMBER NUMBER 
 		{hh = $1; mm = $3; merid = 24;
-		daylight = STANDARD; ourzone = $4%100 + 60*$4/100;}
+		foo_daylight = STANDARD; ourzone = $4%100 + 60*$4/100;}
 	| NUMBER ':' NUMBER ':' NUMBER 
 		{hh = $1; mm = $3; ss = $5; merid = 24;}
 	| NUMBER ':' NUMBER ':' NUMBER MERIDIAN 
 		{hh = $1; mm = $3; ss = $5; merid = $6;}
 	| NUMBER ':' NUMBER ':' NUMBER NUMBER 
 		{hh = $1; mm = $3; ss = $5; merid = 24;
-		daylight = STANDARD; ourzone = $6%100 + 60*$6/100;};
+		foo_daylight = STANDARD; ourzone = $6%100 + 60*$6/100;};
 
 zone:	ZONE 
-		{ourzone = $1; daylight = STANDARD;}
+		{ourzone = $1; foo_daylight = STANDARD;}
 	| DAYZONE 
-		{ourzone = $1; daylight = DAYLIGHT;};
+		{ourzone = $1; foo_daylight = DAYLIGHT;};
 
 dyspec:	DAY 
 		{dayord = 1; dayreq = $1;}