Preliminary cleanup for splitting host/native/target.

[deliverable/binutils-gdb.git] / gdb / mcheck.c

diff --git a/gdb/mcheck.c b/gdb/mcheck.c
index 611a378ee9689cfa318c87ea54ade8fa54b369e5..38b997a97e82c71d7afd23e0dd3cc7ed0fce8941 100755 (executable)
--- a/gdb/mcheck.c
+++ b/gdb/mcheck.c
@@ -20,7 +20,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "ansidecl.h"
-#include <stdlib.h>
+#define size_t unsigned int
+#define ptrdiff_t int
+#define NULL 0
+#define __ONEFILE
 #include "gmalloc.h"
 
 /* Old hook values.  */
@@ -28,15 +31,10 @@ static void EXFUN((*old_free_hook), (PTR ptr));
 static PTR EXFUN((*old_malloc_hook), (size_t size));
 static PTR EXFUN((*old_realloc_hook), (PTR ptr, size_t size));
 
-/* FIXME.  We cannot *declare* abort() as either being void or being
-   int, because if the system declares it as the other, we get a fatal
-   error.  It's senseless to configure the system for whether abort is
-   void or int.  So we simply fail to declare it, which works on all
-   systems, but might produce a warning on yours.  Please ignore the warning
-   and raise your middle finger in the general direction of the ANSI C
-   committee in tribute.  */
+
 /* Function to call when something awful happens. */
-static void EXFUN((*abortfunc), (void)) = (void (*)()) abort;
+extern void abort();
+static void EXFUN((*abortfunc), (NOARGS)) = (void (*)()) abort;
 
 /* Arbitrary magical numbers.  */
 #define MAGICWORD      0xfedabeeb
@@ -105,7 +103,7 @@ DEFUN(reallochook, (ptr, size), PTR ptr AND size_t size)
 }
 
 void
-DEFUN(mcheck, (func), void EXFUN((*func), (void)))
+DEFUN(mcheck, (func), void EXFUN((*func), (NOARGS)))
 {
   static int mcheck_used = 0;