Working

[cc65] / include / conio.h

diff --git a/include/conio.h b/include/conio.h
index 6f232c037aa0b53e5e5f5e5ca1d82cec336a42bf..71bd74023665adb9ad71a5a5ae98ea4d290f1d96 100644 (file)
--- a/include/conio.h
+++ b/include/conio.h
@@ -54,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
 
 
@@ -121,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);