From 6fdb356db743dd986d479fffe994fff5e9045518 Mon Sep 17 00:00:00 2001
From: Fabrizio Caruso <fabrizio_caruso@hotmail.com>
Date: Thu, 24 Sep 2020 18:01:56 +0200
Subject: [PATCH 1/3] Simplify Gamate tile redefinition (as already done for
 PCE)

---
 libsrc/gamate/conio.s            | 6 +-----
 libsrc/gamate/{vga.inc => vga.s} | 7 ++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename libsrc/gamate/{vga.inc => vga.s} (99%)
 mode change 100644 => 100755

diff --git a/libsrc/gamate/conio.s b/libsrc/gamate/conio.s
index 6ac439490..33437cc04 100644
--- a/libsrc/gamate/conio.s
+++ b/libsrc/gamate/conio.s
@@ -1,6 +1,7 @@
         .include        "gamate.inc"
         .include        "extzp.inc"
 
+        .import         fontdata
         .import         colors
         .importzp       ptr1, tmp1
 
@@ -24,8 +25,3 @@ initconio:
         sta     BGCOLOR
         rts
 
-        .segment        "RODATA"
-
-        .export         fontdata
-fontdata:
-        .include        "vga.inc"
diff --git a/libsrc/gamate/vga.inc b/libsrc/gamate/vga.s
old mode 100644
new mode 100755
similarity index 99%
rename from libsrc/gamate/vga.inc
rename to libsrc/gamate/vga.s
index da20dd4aa..39a8df173
--- a/libsrc/gamate/vga.inc
+++ b/libsrc/gamate/vga.s
@@ -1,6 +1,11 @@
-
 ; VGA charset for the Gamate conio implementation
 
+.export fontdata
+
+.rodata
+
+fontdata:
+
         .byte   $00, $00, $00, $00, $00, $00, $00, $00
 
         ; 1

From 61ebe2c34b6755fa0c71f89bfeee873a51f636f5 Mon Sep 17 00:00:00 2001
From: Fabrizio Caruso <fabrizio_caruso@hotmail.com>
Date: Thu, 24 Sep 2020 19:32:15 +0200
Subject: [PATCH 2/3] Indentation in vga.s for gamate

---
 libsrc/gamate/vga.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsrc/gamate/vga.s b/libsrc/gamate/vga.s
index 39a8df173..310560015 100755
--- a/libsrc/gamate/vga.s
+++ b/libsrc/gamate/vga.s
@@ -1,8 +1,8 @@
 ; VGA charset for the Gamate conio implementation
 
-.export fontdata
+        .export fontdata
 
-.rodata
+        .rodata
 
 fontdata:
 

From 47ee1792732def69c8ba6255a3078f0492e4ddd3 Mon Sep 17 00:00:00 2001
From: Greg King <gregdk@users.sf.net>
Date: Fri, 25 Sep 2020 00:30:49 -0400
Subject: [PATCH 3/3] Fixed a copy & paste error in the test/misc/ makefile.

Fixed a warning that's changed to an error in Travis CI tests.
---
 test/misc/Makefile  |  2 +-
 test/misc/bug1263.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/misc/Makefile b/test/misc/Makefile
index f8832e77e..deacc9464 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -95,7 +95,7 @@ $(WORKDIR)/pptest2.$1.$2.prg: pptest2.c | $(WORKDIR)
 	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
 
 # should compile, but gives an error
-$(WORKDIR)/bug1263.$1.$2.prg: pptest2.c | $(WORKDIR)
+$(WORKDIR)/bug1263.$1.$2.prg: bug1263.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/bug1263.$1.$2.prg)
 	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
diff --git a/test/misc/bug1263.c b/test/misc/bug1263.c
index 457e64034..4e5987c58 100644
--- a/test/misc/bug1263.c
+++ b/test/misc/bug1263.c
@@ -1,17 +1,15 @@
+/* bug #1263 - erroneous error for K & R function declaration */
 
-/* bug #1263 - erroneous error for implicit function declaration */
-
-#include <stdlib.h>
-
-enum E { I };
+enum E { I = 0 };
 extern int f(enum E);
+
 int f(e)
   enum E e;
 {
-  return 1;
+  return e;
 }
 
 int main(void)
 {
-    return f(1) ? EXIT_SUCCESS : EXIT_FAILURE;
+    return f(I);
 }