Working

[cc65] / include / conio.h

diff --git a/include/conio.h b/include/conio.h
index 552b8d5ee1964182ed65a701410432b413440de8..71bd74023665adb9ad71a5a5ae98ea4d290f1d96 100644 (file)
--- a/include/conio.h
+++ b/include/conio.h
@@ -1,9 +1,39 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 conio.h                                  */
+/*                                                                           */
+/*                           Direct console I/O                             */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2000 Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@musoftware.de                                            */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
 /*
- * conio.h
- *
- * Ullrich von Bassewitz, 06.08.1998
- *
- *
  * This is the direct console interface for cc65. I do not like the function
  * names very much, but the first version started as a rewrite of Borlands
  * conio, and, even if the interface has changed, the names did not.
@@ -15,7 +45,6 @@
  *
  * Most routines do not check the parameters. This may be unfortunate but is
  * also related to speed. The coordinates are always 0/0 based.
- *
  */
 
 
@@ -25,27 +54,17 @@
 
 
 
-#ifndef _STDARG_H
+#if !defined(_STDARG_H)
 #  include <stdarg.h>
 #endif
 
-/* Read the CBM file if we're compiling for a CBM machine */
-#ifdef __CBM__
-#  ifndef _CBM_H
-#    include <cbm.h>
-#  endif
-#endif
-
-#ifdef __APPLE2__
-#  ifndef _APPLE2_H
-#    include <apple2.h>
-#  endif
-#endif
-
-#ifdef __ATARI__
-#  ifndef _ATARI_H
-#    include <atari.h>
-#  endif
+/* Include the correct machine specific file */
+#if defined(__CBM__) && !defined(_CBM_H)
+#  include <cbm.h>
+#elif defined(__APPLE2__) && !defined(_APPLE2_H)
+#  include <apple2.h>
+#elif defined(__ATARI__) && !defined(_ATARI_H)
+#  include <atari.h>
 #endif
 
 
@@ -92,7 +111,7 @@ void __fastcall__ cputsxy (unsigned char x, unsigned char y, const char* s);
 int cprintf (const char* format, ...);
 /* Like printf, but uses direct screen I/O */
 
-int vcprintf (const char* format, va_list ap);
+int __fastcall__ vcprintf (const char* format, va_list ap);
 /* Like vprintf, but uses direct screen I/O */
 
 char cgetc (void);
@@ -151,6 +170,7 @@ void __fastcall__ cputhex16 (unsigned val);
 /* These shouldn't be here... */
 
 
+
 /* End of conio.h */
 #endif