From 136763a4cc9ca3a4f59d05b79eede2159d6f441e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 4 May 2019 23:05:56 +0100 Subject: Move .bzrignore to .gitignore Tweak format to match gitignore(5)'s syntax. --- 915resolution/.bzrignore | 3 --- 915resolution/.gitignore | 3 +++ disabled/gpxe/.bzrignore | 3 --- disabled/gpxe/.gitignore | 3 +++ disabled/zfs/.bzrignore | 5 ----- disabled/zfs/.gitignore | 5 +++++ lua/.bzrignore | 3 --- lua/.gitignore | 3 +++ ntldr-img/.bzrignore | 3 --- ntldr-img/.gitignore | 3 +++ 10 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 915resolution/.bzrignore create mode 100644 915resolution/.gitignore delete mode 100644 disabled/gpxe/.bzrignore create mode 100644 disabled/gpxe/.gitignore delete mode 100644 disabled/zfs/.bzrignore create mode 100644 disabled/zfs/.gitignore delete mode 100644 lua/.bzrignore create mode 100644 lua/.gitignore delete mode 100644 ntldr-img/.bzrignore create mode 100644 ntldr-img/.gitignore diff --git a/915resolution/.bzrignore b/915resolution/.bzrignore deleted file mode 100644 index 9419894ae..000000000 --- a/915resolution/.bzrignore +++ /dev/null @@ -1,3 +0,0 @@ -**/.deps-core -**/.dirstamp -Makefile.core.am diff --git a/915resolution/.gitignore b/915resolution/.gitignore new file mode 100644 index 000000000..56219d403 --- /dev/null +++ b/915resolution/.gitignore @@ -0,0 +1,3 @@ +.deps-core +.dirstamp +/Makefile.core.am diff --git a/disabled/gpxe/.bzrignore b/disabled/gpxe/.bzrignore deleted file mode 100644 index 9419894ae..000000000 --- a/disabled/gpxe/.bzrignore +++ /dev/null @@ -1,3 +0,0 @@ -**/.deps-core -**/.dirstamp -Makefile.core.am diff --git a/disabled/gpxe/.gitignore b/disabled/gpxe/.gitignore new file mode 100644 index 000000000..56219d403 --- /dev/null +++ b/disabled/gpxe/.gitignore @@ -0,0 +1,3 @@ +.deps-core +.dirstamp +/Makefile.core.am diff --git a/disabled/zfs/.bzrignore b/disabled/zfs/.bzrignore deleted file mode 100644 index f1d6c22e3..000000000 --- a/disabled/zfs/.bzrignore +++ /dev/null @@ -1,5 +0,0 @@ -**/.deps-core -**/.deps-util -**/.dirstamp -Makefile.core.am -Makefile.util.am diff --git a/disabled/zfs/.gitignore b/disabled/zfs/.gitignore new file mode 100644 index 000000000..6931cccf6 --- /dev/null +++ b/disabled/zfs/.gitignore @@ -0,0 +1,5 @@ +.deps-core +.deps-util +.dirstamp +/Makefile.core.am +/Makefile.util.am diff --git a/lua/.bzrignore b/lua/.bzrignore deleted file mode 100644 index 9419894ae..000000000 --- a/lua/.bzrignore +++ /dev/null @@ -1,3 +0,0 @@ -**/.deps-core -**/.dirstamp -Makefile.core.am diff --git a/lua/.gitignore b/lua/.gitignore new file mode 100644 index 000000000..56219d403 --- /dev/null +++ b/lua/.gitignore @@ -0,0 +1,3 @@ +.deps-core +.dirstamp +/Makefile.core.am diff --git a/ntldr-img/.bzrignore b/ntldr-img/.bzrignore deleted file mode 100644 index 9419894ae..000000000 --- a/ntldr-img/.bzrignore +++ /dev/null @@ -1,3 +0,0 @@ -**/.deps-core -**/.dirstamp -Makefile.core.am diff --git a/ntldr-img/.gitignore b/ntldr-img/.gitignore new file mode 100644 index 000000000..56219d403 --- /dev/null +++ b/ntldr-img/.gitignore @@ -0,0 +1,3 @@ +.deps-core +.dirstamp +/Makefile.core.am -- cgit v1.2.3 From 8a245d5c1800627af4cefa99162a89c7a46d8842 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 8 Nov 2019 08:06:45 +0000 Subject: 915resolution: Fix build failure with GCC 9 GCC 9 has a new -Waddress-of-packed-member warning, enabled by default; set_mode trips over this by taking the addresses of members of the packed modeline structs. Use local variables to avoid this. --- 915resolution/915resolution.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/915resolution/915resolution.c b/915resolution/915resolution.c index 9a73d5fb1..0091a6695 100644 --- a/915resolution/915resolution.c +++ b/915resolution/915resolution.c @@ -758,13 +758,23 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car vbios_modeline_type2 * modeline = &res->modelines[j]; if (modeline->x1 == xprev && modeline->y1 == yprev) { + unsigned long clock; + word hsyncstart, hsyncend, hblank; + word vsyncstart, vsyncend, vblank; + modeline->x1 = modeline->x2 = x-1; modeline->y1 = modeline->y2 = y-1; - gtf_timings(x, y, freqs[j], &modeline->clock, - &modeline->hsyncstart, &modeline->hsyncend, - &modeline->hblank, &modeline->vsyncstart, - &modeline->vsyncend, &modeline->vblank); + gtf_timings(x, y, freqs[j], &clock, + &hsyncstart, &hsyncend, &hblank, + &vsyncstart, &vsyncend, &vblank); + modeline->clock = clock; + modeline->hsyncstart = hsyncstart; + modeline->hsyncend = hsyncend; + modeline->hblank = hblank; + modeline->vsyncstart = vsyncstart; + modeline->vsyncend = vsyncend; + modeline->vblank = vblank; if (htotal) modeline->htotal = htotal; @@ -790,13 +800,24 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car vbios_modeline_type3 * modeline = &res->modelines[j]; if (modeline->x1 == xprev && modeline->y1 == yprev) { + unsigned long clock; + word hsyncstart, hsyncend, hblank; + word vsyncstart, vsyncend, vblank; + modeline->x1 = modeline->x2 = x-1; modeline->y1 = modeline->y2 = y-1; - gtf_timings(x, y, freqs[j], &modeline->clock, - &modeline->hsyncstart, &modeline->hsyncend, - &modeline->hblank, &modeline->vsyncstart, - &modeline->vsyncend, &modeline->vblank); + gtf_timings(x, y, freqs[j], &clock, + &hsyncstart, &hsyncend, &hblank, + &vsyncstart, &vsyncend, &vblank); + modeline->clock = clock; + modeline->hsyncstart = hsyncstart; + modeline->hsyncend = hsyncend; + modeline->hblank = hblank; + modeline->vsyncstart = vsyncstart; + modeline->vsyncend = vsyncend; + modeline->vblank = vblank; + if (htotal) modeline->htotal = htotal; else -- cgit v1.2.3