From 773e05b5f39076d433dd3145f30064c9943d12cc Mon Sep 17 00:00:00 2001
From: "ol.sc" <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 10 Sep 2009 19:18:15 +0000
Subject: [PATCH] Removed '_' prefix from textframe(xy) because this prefix for
 non-standard symbols isn't necessary if they are declared in non-standard
 include files.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4143 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 doc/apple2enh.sgml        |  5 +++--
 doc/funcref.sgml          |  4 ++--
 include/apple2enh.h       | 18 +++++++++---------
 libsrc/apple2/textframe.s | 16 ++++++++--------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/doc/apple2enh.sgml b/doc/apple2enh.sgml
index 17259ab1d..dac70e877 100644
--- a/doc/apple2enh.sgml
+++ b/doc/apple2enh.sgml
@@ -126,9 +126,10 @@ usage.
 
 <itemize>
 <item>_dos_type
-<item>_textframe
-<item>_textframexy
 <item>get_ostype
+<item>textframe
+<item>textframexy
+<item>videomode
 </itemize>
 
 
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index bc49e0828..628362d87 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -74,9 +74,9 @@ function.
 
 <itemize>
 <item>_dos_type
-<item>_textframe
-<item>_textframexy
 <item><ref id="get_ostype" name="get_ostype">
+<item>textframe
+<item>textframexy
 <item><ref id="videomode" name="videomode">
 </itemize>
 
diff --git a/include/apple2enh.h b/include/apple2enh.h
index 39aefdd9f..0da2a351e 100644
--- a/include/apple2enh.h
+++ b/include/apple2enh.h
@@ -72,9 +72,9 @@
 #define CH_F9	    	0xB9
 #define CH_F10	    	0xB0
 
-/* Styles for _textframe */
-#define _TEXTFRAME_WIDE	0x00
-#define _TEXTFRAME_TALL	0x04
+/* Styles for textframe */
+#define TEXTFRAME_WIDE	0x00
+#define TEXTFRAME_TALL	0x04
 
 /* Video modes */
 #define VIDEOMODE_40x24 0x0011
@@ -90,16 +90,16 @@
 
 
 
-void __fastcall__ _textframe (unsigned char width, unsigned char height,
-		    	      unsigned char style);
+void __fastcall__ textframe (unsigned char width, unsigned char height,
+                             unsigned char style);
 /* Output a frame on the text screen with the given width and height
  * starting at the current cursor position and using the given style.
  */
 
-void __fastcall__ _textframexy (unsigned char x, unsigned char y,
-		    		unsigned char width, unsigned char height,
-		    		unsigned char style);
-/* Same as "gotoxy (x, y); _textframe (width, height, style);" */
+void __fastcall__ textframexy (unsigned char x, unsigned char y,
+                               unsigned char width, unsigned char height,
+                               unsigned char style);
+/* Same as "gotoxy (x, y); textframe (width, height, style);" */
 
 unsigned __fastcall__ videomode (unsigned mode);
 /* Set the video mode, return the old mode. Call with one of the VIDEOMODE_xx
diff --git a/libsrc/apple2/textframe.s b/libsrc/apple2/textframe.s
index 9ed42cad4..c62cbb75d 100644
--- a/libsrc/apple2/textframe.s
+++ b/libsrc/apple2/textframe.s
@@ -1,14 +1,14 @@
 ;
 ; Oliver Schmidt, 10.03.2004
 ;
-; void __fastcall__ _textframexy (unsigned char x, unsigned char y,
-;                                 unsigned char width, unsigned char height,
-;                                 unsigned char style);
-; void __fastcall__ _textframe (unsigned char width, unsigned char height);
-;                               unsigned char style);
+; void __fastcall__ textframexy (unsigned char x, unsigned char y,
+;                                unsigned char width, unsigned char height,
+;                                unsigned char style);
+; void __fastcall__ textframe (unsigned char width, unsigned char height,
+;                              unsigned char style);
 ;
 
-        .export 	__textframexy, __textframe
+        .export 	_textframexy, _textframe
         .import 	popa, pusha, _gotoxy
         .import		chlinedirect, cvlinedirect
 
@@ -20,11 +20,11 @@ HEIGHT  = tmp3
 XORIGIN = tmp4
 YORIGIN = ptr1
 
-__textframexy:
+_textframexy:
         sec
         bra	:+
 
-__textframe:
+_textframe:
         clc
 :       ldx	INVFLG
         phx			; Save character display mode
-- 
2.39.5