From 3846e8c53660505d6b39243d5c54f5ca15062b14 Mon Sep 17 00:00:00 2001 From: cuz Date: Sat, 13 Mar 2004 21:39:01 +0000 Subject: [PATCH] Fixed inclusion order git-svn-id: svn://svn.cc65.org/cc65/trunk@2918 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- include/apple2.h | 9 +-------- include/apple2enh.h | 43 +++++++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/apple2.h b/include/apple2.h index 16fcaedd2..77e2fc42e 100644 --- a/include/apple2.h +++ b/include/apple2.h @@ -37,19 +37,12 @@ /* Check for errors */ -#if !defined(__APPLE2__) +#if !defined(__APPLE2__) && !defined(__APPLE2ENH__) # error This module may only be used when compiling for the Apple ][! #endif -/* Load the system specific files here, if needed */ -#if defined(__APPLE2ENH__) && !defined(_APPLEENH_H) -# include -#endif - - - /*****************************************************************************/ /* Data */ /*****************************************************************************/ diff --git a/include/apple2enh.h b/include/apple2enh.h index 8efbbc757..914669874 100644 --- a/include/apple2enh.h +++ b/include/apple2enh.h @@ -7,7 +7,7 @@ /* */ /* */ /* (C) 2004 Oliver Schmidt, */ -/* */ +/* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ /* warranty. In no event will the authors be held liable for any damages */ @@ -42,28 +42,35 @@ +/* If not already done, include the apple2.h header file */ +#if !defined(_APPLE2_H) +# include +#endif + + + /*****************************************************************************/ -/* Data */ +/* Data */ /*****************************************************************************/ /* Characters codes */ -#define CH_DEL 0x7F -#define CH_CURS_UP 0x0B +#define CH_DEL 0x7F +#define CH_CURS_UP 0x0B #define CH_CURS_DOWN 0x0A /* These are defined to be OpenApple + NumberKey */ -#define CH_F1 0xB1 -#define CH_F2 0xB2 -#define CH_F3 0xB3 -#define CH_F4 0xB4 -#define CH_F5 0xB5 -#define CH_F6 0xB6 -#define CH_F7 0xB7 -#define CH_F8 0xB8 -#define CH_F9 0xB9 -#define CH_F10 0xB0 +#define CH_F1 0xB1 +#define CH_F2 0xB2 +#define CH_F3 0xB3 +#define CH_F4 0xB4 +#define CH_F5 0xB5 +#define CH_F6 0xB6 +#define CH_F7 0xB7 +#define CH_F8 0xB8 +#define CH_F9 0xB9 +#define CH_F10 0xB0 /* Styles for _textframe */ #define _TEXTFRAME_WIDE 0x00 @@ -72,20 +79,20 @@ /*****************************************************************************/ -/* Code */ +/* Code */ /*****************************************************************************/ void __fastcall__ _textframe (unsigned char width, unsigned char height, - unsigned char style); + 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); + unsigned char width, unsigned char height, + unsigned char style); /* Same as "gotoxy (x, y); _textframe (width, height, style);" */ -- 2.39.5