From: izydorst <izydorst@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 20 Dec 2002 23:16:44 +0000 (+0000)
Subject: putchar.s moved to put_char.s due to name conflict with one of common/ files
X-Git-Tag: V2.12.0~1865
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f9dd23746f5011ae5b482b91dd2f762a9c011d8;p=cc65

putchar.s moved to put_char.s due to name conflict with one of common/ files


git-svn-id: svn://svn.cc65.org/cc65/trunk@1806 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/libsrc/geos/graph/Makefile b/libsrc/geos/graph/Makefile
index 9ea62b994..82b7cb123 100644
--- a/libsrc/geos/graph/Makefile
+++ b/libsrc/geos/graph/Makefile
@@ -11,7 +11,7 @@
 S_OBJS	= drawline.o drawpoint.o framerectangle.o hlineregs.o horizontalline.o\
 	  imprintrectangle.o invertline.o invertrectangle.o pointregs.o recoverline.o\
 	  recoverrectangle.o rectangle.o initdrawwindow.o setpattern.o testpoint.o verticalline.o\
-	  putchar.o putdecimal.o putstring.o usesystemfont.o\
+	  put_char.o putdecimal.o putstring.o usesystemfont.o\
 	  getcharwidth.o loadcharset.o bitmapup.o bitmapregs.o bitmapclip.o bitotherclip.o\
 	  graphicsstring.o getintcharint.o
 
diff --git a/libsrc/geos/graph/put_char.s b/libsrc/geos/graph/put_char.s
new file mode 100644
index 000000000..ed885800e
--- /dev/null
+++ b/libsrc/geos/graph/put_char.s
@@ -0,0 +1,21 @@
+
+;
+; Maciej 'YTM/Alliance' Witkowiak
+;
+; 30.10.99
+
+; void PutChar         (char character, char y, int x);
+
+	    .import popa
+	    .export _PutChar
+
+	    .include "../inc/jumptab.inc"
+	    .include "../inc/geossym.inc"
+
+_PutChar:
+	    sta r11L
+	    stx r11H
+	    jsr popa
+	    sta r1H
+	    jsr popa
+	    jmp PutChar
diff --git a/libsrc/geos/graph/putchar.s b/libsrc/geos/graph/putchar.s
deleted file mode 100644
index ed885800e..000000000
--- a/libsrc/geos/graph/putchar.s
+++ /dev/null
@@ -1,21 +0,0 @@
-
-;
-; Maciej 'YTM/Alliance' Witkowiak
-;
-; 30.10.99
-
-; void PutChar         (char character, char y, int x);
-
-	    .import popa
-	    .export _PutChar
-
-	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
-
-_PutChar:
-	    sta r11L
-	    stx r11H
-	    jsr popa
-	    sta r1H
-	    jsr popa
-	    jmp PutChar