1 |
josejx 09/07/16 15:31:40 |
2 |
|
3 |
Modified: common.h of.c |
4 |
Log: |
5 |
Fixed some GCC 4.3 compile warnings. |
6 |
|
7 |
Revision Changes Path |
8 |
1.2 Xorgautoconfig/ddcprobe/common.h |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/common.h?rev=1.2&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/common.h?rev=1.2&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/common.h?r1=1.1&r2=1.2 |
13 |
|
14 |
Index: common.h |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-src/Xorgautoconfig/ddcprobe/common.h,v |
17 |
retrieving revision 1.1 |
18 |
retrieving revision 1.2 |
19 |
diff -u -r1.1 -r1.2 |
20 |
--- common.h 18 Apr 2005 01:25:27 -0000 1.1 |
21 |
+++ common.h 16 Jul 2009 15:31:40 -0000 1.2 |
22 |
@@ -114,13 +114,13 @@ |
23 |
(((_x).vimage_size_hi << 8) + (_x).vimage_size) |
24 |
unsigned char hborder; |
25 |
unsigned char vborder; |
26 |
- struct { |
27 |
+ struct __attribute__ ((packed)) { |
28 |
unsigned char interlaced: 1; |
29 |
unsigned char stereo: 2; |
30 |
unsigned char digital_composite: 2; |
31 |
unsigned char variant: 2; |
32 |
unsigned char zero: 1; |
33 |
- } flags __attribute__ ((packed)); |
34 |
+ } flags; |
35 |
} __attribute__ ((packed)); |
36 |
|
37 |
enum { |
38 |
@@ -170,27 +170,27 @@ |
39 |
unsigned char year; |
40 |
unsigned char version; |
41 |
unsigned char revision; |
42 |
- struct { |
43 |
+ struct __attribute__ ((packed)) { |
44 |
unsigned char digital: 1; |
45 |
unsigned char separate_sync: 1; |
46 |
unsigned char composite_sync: 1; |
47 |
unsigned char sync_on_green: 1; |
48 |
unsigned char unused: 2; |
49 |
unsigned char voltage_level: 2; |
50 |
- } video_input_definition __attribute__ ((packed)); |
51 |
+ } video_input_definition; |
52 |
unsigned char max_size_horizontal; |
53 |
unsigned char max_size_vertical; |
54 |
unsigned char gamma; |
55 |
- struct { |
56 |
+ struct __attribute__ ((packed)) { |
57 |
unsigned char unused1: 3; |
58 |
unsigned char rgb: 1; |
59 |
unsigned char unused2: 1; |
60 |
unsigned char active_off: 1; |
61 |
unsigned char suspend: 1; |
62 |
unsigned char standby: 1; |
63 |
- } feature_support __attribute__ ((packed)); |
64 |
+ } feature_support; |
65 |
unsigned char color_characteristics[10]; |
66 |
- struct { |
67 |
+ struct __attribute__ ((packed)) { |
68 |
unsigned char timing_720x400_70: 1; |
69 |
unsigned char timing_720x400_88: 1; |
70 |
unsigned char timing_640x480_60: 1; |
71 |
@@ -207,12 +207,12 @@ |
72 |
unsigned char timing_1024x768_70: 1; |
73 |
unsigned char timing_1024x768_75: 1; |
74 |
unsigned char timing_1280x1024_75: 1; |
75 |
- } established_timings __attribute__ ((packed)); |
76 |
- struct { |
77 |
+ } established_timings; |
78 |
+ struct __attribute__ ((packed)) { |
79 |
unsigned char timing_1152x870_75: 1; |
80 |
unsigned char reserved: 7; |
81 |
- } manufacturer_timings __attribute__ ((packed)); |
82 |
- struct { |
83 |
+ } manufacturer_timings; |
84 |
+ struct __attribute__ ((packed)) { |
85 |
#if __BYTE_ORDER == __LITTLE_ENDIAN |
86 |
u_int16_t xresolution: 8; |
87 |
u_int16_t vfreq: 6; |
88 |
@@ -222,11 +222,11 @@ |
89 |
u_int16_t vfreq: 6; |
90 |
u_int16_t xresolution: 8; |
91 |
#endif |
92 |
- } standard_timing[8] __attribute__ ((packed)); |
93 |
- union { |
94 |
+ } standard_timing[8]; |
95 |
+ union __attribute__ ((packed)) { |
96 |
struct edid_detailed_timing detailed_timing[4]; |
97 |
struct edid_monitor_descriptor monitor_descriptor[4]; |
98 |
- } monitor_details __attribute__ ((packed)); |
99 |
+ } monitor_details; |
100 |
unsigned char extension_flag; |
101 |
unsigned char checksum; |
102 |
unsigned char padding[128]; |
103 |
|
104 |
|
105 |
|
106 |
1.3 Xorgautoconfig/ddcprobe/of.c |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/of.c?rev=1.3&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/of.c?rev=1.3&content-type=text/plain |
110 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/Xorgautoconfig/ddcprobe/of.c?r1=1.2&r2=1.3 |
111 |
|
112 |
Index: of.c |
113 |
=================================================================== |
114 |
RCS file: /var/cvsroot/gentoo-src/Xorgautoconfig/ddcprobe/of.c,v |
115 |
retrieving revision 1.2 |
116 |
retrieving revision 1.3 |
117 |
diff -u -r1.2 -r1.3 |
118 |
--- of.c 11 Jun 2005 21:56:19 -0000 1.2 |
119 |
+++ of.c 16 Jul 2009 15:31:40 -0000 1.3 |
120 |
@@ -18,7 +18,7 @@ |
121 |
{ |
122 |
struct vbe_info *ret = NULL; |
123 |
struct fb_fix_screeninfo fix; |
124 |
- unsigned char *mem; |
125 |
+ char *mem; |
126 |
int rc = 0; |
127 |
int fd, i; |