From e531e5abd1ed597e7227afe9224b0ee20bd8982a Mon Sep 17 00:00:00 2001 From: uz Date: Thu, 7 Jul 2011 20:19:35 +0000 Subject: [PATCH] Removed __fastcall__ declarations for functions without parameters. git-svn-id: svn://svn.cc65.org/cc65/trunk@5073 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- include/cbm.h | 4 ++-- include/em.h | 18 +++++++++--------- include/joystick.h | 14 +++++++------- include/mouse.h | 12 ++++++------ include/nes.h | 4 ++-- include/serial.h | 14 +++++++------- include/stdio.h | 4 ++-- include/stdlib.h | 6 +++--- include/tgi.h | 36 ++++++++++++++++++------------------ libsrc/common/getchar.c | 2 +- 10 files changed, 57 insertions(+), 57 deletions(-) diff --git a/include/cbm.h b/include/cbm.h index 8e6a92439..34ab106ae 100644 --- a/include/cbm.h +++ b/include/cbm.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (c) 1998-2011, Ullrich von Bassewitz */ +/* (C) 1998-2011, Ullrich von Bassewitz */ /* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ @@ -161,7 +161,7 @@ struct cbm_dirent { #define TV_PAL 1 #define TV_OTHER 2 -unsigned char __fastcall__ get_tv (void); +unsigned char get_tv (void); /* Return the video mode the machine is using. */ diff --git a/include/em.h b/include/em.h index 38eb24bb7..f61a8a74f 100644 --- a/include/em.h +++ b/include/em.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2002-2003 Ullrich von Bassewitz */ -/* Römerstrasse 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 2002-2011, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -78,18 +78,18 @@ struct em_copy { unsigned char __fastcall__ em_load_driver (const char* driver); /* Load and install an extended memory driver. Return an error code. */ -unsigned char __fastcall__ em_unload (void); +unsigned char em_unload (void); /* Uninstall, then unload the currently loaded driver. */ unsigned char __fastcall__ em_install (void* driver); /* Install an already loaded driver. Return an error code. */ -unsigned char __fastcall__ em_uninstall (void); +unsigned char em_uninstall (void); /* Uninstall the currently loaded driver and return an error code. * Note: This call does not free allocated memory. */ -unsigned __fastcall__ em_pagecount (void); +unsigned em_pagecount (void); /* Return the total number of 256 byte pages available in extended memory. */ void* __fastcall__ em_map (unsigned page); @@ -107,7 +107,7 @@ void* __fastcall__ em_use (unsigned page); * use, this call may perform better than em_map. */ -void __fastcall__ em_commit (void); +void em_commit (void); /* Commit changes in the memory window to extended storage. If the contents * of the memory window have been changed, these changes may be lost if * em_map, em_copyfrom or em_copyto are called without calling em_commit @@ -127,7 +127,7 @@ void __fastcall__ em_copyto (const struct em_copy* copy_data); -/* End of em.h */ +/* End of em.h */ #endif diff --git a/include/joystick.h b/include/joystick.h index 0c8da07c0..f93e7c027 100644 --- a/include/joystick.h +++ b/include/joystick.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998-2004 Ullrich von Bassewitz */ -/* Römerstrasse 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 1998-2011, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -88,18 +88,18 @@ extern const char joy_stddrv[]; unsigned char __fastcall__ joy_load_driver (const char* driver); /* Load and install a joystick driver. Return an error code. */ -unsigned char __fastcall__ joy_unload (void); +unsigned char joy_unload (void); /* Uninstall, then unload the currently loaded driver. */ unsigned char __fastcall__ joy_install (void* driver); /* Install an already loaded driver. Return an error code. */ -unsigned char __fastcall__ joy_uninstall (void); +unsigned char joy_uninstall (void); /* Uninstall the currently loaded driver and return an error code. * Note: This call does not free allocated memory. */ -unsigned char __fastcall__ joy_count (void); +unsigned char joy_count (void); /* Return the number of joysticks supported by the driver */ unsigned char __fastcall__ joy_read (unsigned char joystick); diff --git a/include/mouse.h b/include/mouse.h index 3d6226185..27577d193 100644 --- a/include/mouse.h +++ b/include/mouse.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (C) 2003-2009, Ullrich von Bassewitz */ +/* (C) 2003-2011, Ullrich von Bassewitz */ /* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ @@ -119,26 +119,26 @@ unsigned char __fastcall__ mouse_load_driver (const struct mouse_callbacks* c, const char* driver); /* Load and install a mouse driver, return an error code. */ -unsigned char __fastcall__ mouse_unload (void); +unsigned char mouse_unload (void); /* Uninstall, then unload the currently loaded driver. */ unsigned char __fastcall__ mouse_install (const struct mouse_callbacks* c, void* driver); /* Install an already loaded driver. Returns an error code. */ -unsigned char __fastcall__ mouse_uninstall (void); +unsigned char mouse_uninstall (void); /* Uninstall the currently loaded driver. Returns an error code. */ const char* __fastcall__ mouse_geterrormsg (unsigned char code); /* Get an error message describing the error in code. */ -void __fastcall__ mouse_hide (void); +void mouse_hide (void); /* Hide the mouse. The function manages a counter and may be called more than * once. For each call to mouse_hide there must be a call to mouse_show to make * the mouse visible again. */ -void __fastcall__ mouse_show (void); +void mouse_show (void); /* Show the mouse. See mouse_hide for more information. */ void __fastcall__ mouse_setbox (const struct mouse_box* box); @@ -167,7 +167,7 @@ void __fastcall__ mouse_move (int x, int y); * inside the bounding box. */ -unsigned char __fastcall__ mouse_buttons (void); +unsigned char mouse_buttons (void); /* Return a bit mask encoding the states of the mouse buttons. Use the * MOUSE_BTN_XXX flags to decode a specific button. */ diff --git a/include/nes.h b/include/nes.h index 48c5418e0..f93d7d62e 100644 --- a/include/nes.h +++ b/include/nes.h @@ -90,10 +90,10 @@ -void __fastcall__ waitvblank (void); +void waitvblank (void); /* Wait for the vertical blanking */ -unsigned char __fastcall__ get_tv (void); +unsigned char get_tv (void); /* Return the video mode the machine is using. */ diff --git a/include/serial.h b/include/serial.h index 671ec193f..04b5144a2 100644 --- a/include/serial.h +++ b/include/serial.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2003 Ullrich von Bassewitz */ -/* Römerstrasse 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 2003-2011, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -130,13 +130,13 @@ struct ser_params { unsigned char __fastcall__ ser_load_driver (const char* driver); /* Load and install a serial driver. Return an error code. */ -unsigned char __fastcall__ ser_unload (void); +unsigned char ser_unload (void); /* Uninstall, then unload the currently loaded driver. */ unsigned char __fastcall__ ser_install (void* driver); /* Install an already loaded driver. Return an error code. */ -unsigned char __fastcall__ ser_uninstall (void); +unsigned char ser_uninstall (void); /* Uninstall the currently loaded driver and return an error code. * Note: This call does not free allocated memory. */ @@ -144,7 +144,7 @@ unsigned char __fastcall__ ser_uninstall (void); unsigned char __fastcall__ ser_open (const struct ser_params* params); /* "Open" the port by setting the port parameters and enable interrupts. */ -unsigned char __fastcall__ ser_close (void); +unsigned char ser_close (void); /* "Close" the port. Clear buffers and and disable interrupts. */ unsigned char __fastcall__ ser_get (char* b); diff --git a/include/stdio.h b/include/stdio.h index f1601603e..c29fa4901 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (C) 1998-2009, Ullrich von Bassewitz */ +/* (C) 1998-2011, Ullrich von Bassewitz */ /* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ @@ -108,7 +108,7 @@ int __fastcall__ fsetpos (FILE* f, const fpos_t* pos); long __fastcall__ ftell (FILE* f); int __fastcall__ fseek (FILE* f, long offset, int whence); void __fastcall__ rewind (FILE *f); -int __fastcall__ getchar (void); +int getchar (void); char* __fastcall__ gets (char* s); void __fastcall__ perror (const char* s); int printf (const char* format, ...); diff --git a/include/stdlib.h b/include/stdlib.h index 6ca7bbe26..57e7f6166 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (C) 1998-2009, Ullrich von Bassewitz */ +/* (C) 1998-2011, Ullrich von Bassewitz */ /* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ @@ -86,10 +86,10 @@ void __fastcall__ _heapadd (void* mem, size_t size); size_t __fastcall__ _heapblocksize (const void* block); /* Return the size of an allocated block */ -size_t __fastcall__ _heapmemavail (void); +size_t _heapmemavail (void); /* Return the total free heap space */ -size_t __fastcall__ _heapmaxavail (void); +size_t _heapmaxavail (void); /* Return the size of the largest free block on the heap */ diff --git a/include/tgi.h b/include/tgi.h index fe87ebf75..90f8f2e85 100644 --- a/include/tgi.h +++ b/include/tgi.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (C) 2002-2009, Ullrich von Bassewitz */ +/* (C) 2002-2011, Ullrich von Bassewitz */ /* Roemerstrasse 52 */ /* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ @@ -75,7 +75,7 @@ typedef struct tgi_vectorfont tgi_vectorfont; void __fastcall__ tgi_load_driver (const char* name); /* Load and install the given driver. */ -void __fastcall__ tgi_unload (void); +void tgi_unload (void); /* Uninstall, then unload the currently loaded driver. Will call tgi_done if * necessary. */ @@ -83,15 +83,15 @@ void __fastcall__ tgi_unload (void); void __fastcall__ tgi_install (void* driver); /* Install an already loaded driver. */ -void __fastcall__ tgi_uninstall (void); +void tgi_uninstall (void); /* Uninstall the currently loaded driver but do not unload it. Will call * tgi_done if necessary. */ -void __fastcall__ tgi_init (void); +void tgi_init (void); /* Initialize the already loaded graphics driver. */ -void __fastcall__ tgi_done (void); +void tgi_done (void); /* End graphics mode, switch back to text mode. Will NOT uninstall or unload * the driver! */ @@ -111,7 +111,7 @@ void __fastcall__ tgi_install_vectorfont (const tgi_vectorfont* font); void tgi_free_vectorfont (const tgi_vectorfont* font); /* Free a vector font that was previously loaded into memory. */ -unsigned char __fastcall__ tgi_geterror (void); +unsigned char tgi_geterror (void); /* Return the error code for the last operation. This will also clear the * error. */ @@ -119,10 +119,10 @@ unsigned char __fastcall__ tgi_geterror (void); const char* __fastcall__ tgi_geterrormsg (unsigned char code); /* Get an error message describing the error in code. */ -void __fastcall__ tgi_clear (void); +void tgi_clear (void); /* Clear the drawpage. */ -unsigned __fastcall__ tgi_getpagecount (void); +unsigned tgi_getpagecount (void); /* Returns the number of screen pages available. */ void __fastcall__ tgi_setviewpage (unsigned char page); @@ -131,10 +131,10 @@ void __fastcall__ tgi_setviewpage (unsigned char page); void __fastcall__ tgi_setdrawpage (unsigned char page); /* Set the drawable page. Will set an error if the page is not available. */ -unsigned char __fastcall__ tgi_getcolorcount (void); +unsigned char tgi_getcolorcount (void); /* Get the number of available colors. */ -unsigned char __fastcall__ tgi_getmaxcolor (void); +unsigned char tgi_getmaxcolor (void); /* Return the maximum supported color number (the number of colors would * then be getmaxcolor()+1). */ @@ -142,7 +142,7 @@ unsigned char __fastcall__ tgi_getmaxcolor (void); void __fastcall__ tgi_setcolor (unsigned char color); /* Set the current drawing color. */ -unsigned char __fastcall__ tgi_getcolor (void); +unsigned char tgi_getcolor (void); /* Return the current drawing color. */ void __fastcall__ tgi_setpalette (const unsigned char* palette); @@ -150,29 +150,29 @@ void __fastcall__ tgi_setpalette (const unsigned char* palette); * a pointer to as many entries as there are colors. */ -const unsigned char* __fastcall__ tgi_getpalette (void); +const unsigned char* tgi_getpalette (void); /* Return the current palette. */ -const unsigned char* __fastcall__ tgi_getdefpalette (void); +const unsigned char* tgi_getdefpalette (void); /* Return the default palette. */ -unsigned __fastcall__ tgi_getxres (void); +unsigned tgi_getxres (void); /* Return the resolution in X direction. */ -unsigned __fastcall__ tgi_getmaxx (void); +unsigned tgi_getmaxx (void); /* Return the maximum x coordinate. The resolution in x direction is * getmaxx() + 1 */ -unsigned __fastcall__ tgi_getyres (void); +unsigned tgi_getyres (void); /* Return the resolution in Y direction. */ -unsigned __fastcall__ tgi_getmaxy (void); +unsigned tgi_getmaxy (void); /* Return the maximum y coordinate. The resolution in y direction is * getmaxy() + 1 */ -unsigned __fastcall__ tgi_getaspectratio (void); +unsigned tgi_getaspectratio (void); /* Returns the aspect ratio for the loaded driver. The aspect ratio is an * 8.8 fixed point value. */ diff --git a/libsrc/common/getchar.c b/libsrc/common/getchar.c index a37930df8..5c80b9b36 100644 --- a/libsrc/common/getchar.c +++ b/libsrc/common/getchar.c @@ -17,7 +17,7 @@ -int __fastcall__ getchar (void) +int getchar (void) { return fgetc (stdin); } -- 2.39.5