From 38231a5cc69a8d31e0fabc7e3bf47b685a107548 Mon Sep 17 00:00:00 2001
From: Greg King <gregdk@users.sf.net>
Date: Fri, 13 Mar 2015 07:35:47 -0400
Subject: [PATCH] Made _afailed() and uncompress() be fastcall functions.

---
 include/assert.h         | 4 ++--
 include/zlib.h           | 6 +++---
 libsrc/cbm/cbm_load.c    | 6 +++---
 libsrc/common/_afailed.c | 5 +++--
 libsrc/dbg/dbgdump.s     | 2 +-
 libsrc/zlib/uncompress.c | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/assert.h b/include/assert.h
index ceabd2482..504964dc2 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000, Ullrich von Bassewitz                                      */
+/* (C) 1998-2015, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -42,7 +42,7 @@
 #ifdef NDEBUG
 #  define assert(expr)
 #else
-extern void __cdecl__ _afailed (const char*, unsigned);
+extern void __fastcall__ _afailed (const char*, unsigned);
 #  define assert(expr)  ((expr)? (void)0 : _afailed(__FILE__, __LINE__))
 #endif
 
diff --git a/include/zlib.h b/include/zlib.h
index 971095cd3..8fa6a2bd1 100644
--- a/include/zlib.h
+++ b/include/zlib.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2001 Piotr Fusik <fox@scene.pl>                                  */
+/* (C) 2000-2015 Piotr Fusik <fox@scene.pl>                                  */
 /*                                                                           */
 /* This file is based on the zlib.h from 'zlib' general purpose compression  */
 /* library, version 1.1.3, (C) 1995-1998 Jean-loup Gailly and Mark Adler.    */
@@ -83,8 +83,8 @@ unsigned __fastcall__ inflatemem (char* dest, const char* source);
 */
 
 
-int __cdecl__ uncompress (char* dest, unsigned* destLen,
-                          const char* source, unsigned sourceLen);
+int __fastcall__ uncompress (char* dest, unsigned* destLen,
+                             const char* source, unsigned sourceLen);
 /*
    Original zlib description:
 
diff --git a/libsrc/cbm/cbm_load.c b/libsrc/cbm/cbm_load.c
index eba864fcc..c1c6f568a 100644
--- a/libsrc/cbm/cbm_load.c
+++ b/libsrc/cbm/cbm_load.c
@@ -1,9 +1,9 @@
 /*
 ** Marc 'BlackJack' Rintsch, 06.03.2001
 **
-** unsigned int __cdecl__ cbm_load(const char* name,
-**                                 unsigned char device,
-**                                 const unsigned char* data);
+** unsigned int __fastcall__ cbm_load(const char* name,
+**                                    unsigned char device,
+**                                    const unsigned char* data);
 */
 
 #include <cbm.h>
diff --git a/libsrc/common/_afailed.c b/libsrc/common/_afailed.c
index 4e56b93f2..7c6df4a2c 100644
--- a/libsrc/common/_afailed.c
+++ b/libsrc/common/_afailed.c
@@ -1,7 +1,8 @@
 /*
 ** _afailed.c
 **
-** Ullrich von Bassewitz, 06.06.1998
+** 1998-06-06, Ullrich von Bassewitz
+** 2015-03-13, Greg King
 */
 
 
@@ -11,7 +12,7 @@
 
 
 
-void _afailed (char* file, unsigned line)
+void __fastcall__ _afailed (char* file, unsigned line)
 {
     fprintf (stderr, "ASSERTION FAILED IN %s(%u)\n", file, line);
     exit (2);
diff --git a/libsrc/dbg/dbgdump.s b/libsrc/dbg/dbgdump.s
index b2045872f..8ab646d21 100644
--- a/libsrc/dbg/dbgdump.s
+++ b/libsrc/dbg/dbgdump.s
@@ -1,7 +1,7 @@
 ;
 ; Ullrich von Bassewitz, 11.08.1998
 ;
-; char* DbgMemDump (unsigend Addr, char* Buf, unsigned char Length);
+; char* __cdecl__ DbgMemDump (unsigend Addr, char* Buf, unsigned char Length);
 ;
 
         .export         _DbgMemDump
diff --git a/libsrc/zlib/uncompress.c b/libsrc/zlib/uncompress.c
index 7810eb4f8..4e449a3ef 100644
--- a/libsrc/zlib/uncompress.c
+++ b/libsrc/zlib/uncompress.c
@@ -6,8 +6,8 @@
 
 #include <zlib.h>
 
-int uncompress (char* dest, unsigned* destLen,
-                const char* source, unsigned sourceLen)
+int __fastcall__ uncompress (char* dest, unsigned* destLen,
+                             const char* source, unsigned sourceLen)
 {
         unsigned len;
         unsigned char* ptr;