From 3601c3fb9b9d62ea0357700d366f168f0b0967be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20M=C3=BChlstrasser?= <stephan.muehlstrasser@web.de>
Date: Thu, 12 Feb 2015 22:12:51 +0100
Subject: [PATCH] Include "extzp.inc" instead of using direct imports of
 symbols.

---
 libsrc/osic1p/clrscr.s | 2 +-
 libsrc/osic1p/gotox.s  | 4 ++--
 libsrc/osic1p/gotoxy.s | 2 +-
 libsrc/osic1p/gotoy.s  | 2 +-
 libsrc/osic1p/wherex.s | 2 +-
 libsrc/osic1p/wherey.s | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsrc/osic1p/clrscr.s b/libsrc/osic1p/clrscr.s
index 48fb5d4f2..d2346659b 100644
--- a/libsrc/osic1p/clrscr.s
+++ b/libsrc/osic1p/clrscr.s
@@ -3,7 +3,7 @@
 ;
         .export         _clrscr
         .import         plot
-        .importzp       CURS_X, CURS_Y
+        .include        "extzp.inc"
         .include        "osic1p.inc"
 
 ; Adapted from the Challenger Character Graphics
diff --git a/libsrc/osic1p/gotox.s b/libsrc/osic1p/gotox.s
index fb84975d1..0dea72b9a 100644
--- a/libsrc/osic1p/gotox.s
+++ b/libsrc/osic1p/gotox.s
@@ -6,8 +6,8 @@
 ; void gotox (unsigned char x);
 ;
         .export         _gotox
-        .import         plot           
-        .importzp       CURS_X
+        .import         plot
+        .include        "extzp.inc"
 
 _gotox: sta     CURS_X          ; Set new position
         jmp     plot            ; And activate it
diff --git a/libsrc/osic1p/gotoxy.s b/libsrc/osic1p/gotoxy.s
index 32d1f1df2..f76537349 100644
--- a/libsrc/osic1p/gotoxy.s
+++ b/libsrc/osic1p/gotoxy.s
@@ -8,7 +8,7 @@
 ;
         .export         _gotoxy
         .import         popa, plot
-        .importzp       CURS_X, CURS_Y
+        .include        "extzp.inc"
 
 _gotoxy:
         sta     CURS_Y          ; Set Y
diff --git a/libsrc/osic1p/gotoy.s b/libsrc/osic1p/gotoy.s
index fcd60dd31..693863d94 100644
--- a/libsrc/osic1p/gotoy.s
+++ b/libsrc/osic1p/gotoy.s
@@ -7,7 +7,7 @@
 ;
         .export         _gotoy
         .import         plot
-        .importzp       CURS_Y
+        .include        "extzp.inc"
 
 _gotoy: sta     CURS_Y          ; Set the new position
         jmp     plot            ; And activate it
diff --git a/libsrc/osic1p/wherex.s b/libsrc/osic1p/wherex.s
index 7c772a5a2..1155a8abd 100644
--- a/libsrc/osic1p/wherex.s
+++ b/libsrc/osic1p/wherex.s
@@ -5,7 +5,7 @@
 ; unsigned char wherex (void);
 ;
         .export         _wherex
-        .import         CURS_X: zp
+        .include        "extzp.inc"
 
 .proc   _wherex
         lda     CURS_X
diff --git a/libsrc/osic1p/wherey.s b/libsrc/osic1p/wherey.s
index 7449c1ceb..632cf4a15 100644
--- a/libsrc/osic1p/wherey.s
+++ b/libsrc/osic1p/wherey.s
@@ -5,7 +5,7 @@
 ; unsigned char wherey (void);
 ;
         .export         _wherey
-        .import         CURS_Y: zp
+        .include        "extzp.inc"
 
 .proc   _wherey
         lda     CURS_Y