X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libobjc%2Ferror.c;h=b56aa4da66550a47c21d3f27ea049c45fcb917be;hp=7c6ba44b76fadb700f4a8f3e42312c5b56b1cb9c;hb=d32a1b12c47dbca08c63d97aaae3a464ed9d5015;hpb=6ee7a2767f6f0b31bae9ad13066cf9d36663882f

diff --git a/libobjc/error.c b/libobjc/error.c
index 7c6ba44b76f..b56aa4da665 100644
--- a/libobjc/error.c
+++ b/libobjc/error.c
@@ -26,11 +26,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include "objc-private/common.h"
 #include "objc-private/error.h"
 
-/* __USE_FIXED_PROTOTYPES__ used to be required to get prototypes for
-   malloc, free, etc. on some platforms.  It is unclear if we still
-   need it, but it can't hurt.
-*/
-#define __USE_FIXED_PROTOTYPES__
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -46,53 +41,3 @@ _objc_abort (const char *fmt, ...)
   abort ();
   va_end (ap);
 }
-
-/* The rest of the file is deprecated.  */
-#include "objc/objc-api.h" /* For objc_error_handler.  */
-
-/*
-** Error handler function
-** NULL so that default is to just print to stderr
-*/
-static objc_error_handler _objc_error_handler = NULL;
-
-/* Trigger an objc error */
-void
-objc_error (id object, int code, const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start (ap, fmt);
-  objc_verror (object, code, fmt, ap);
-  va_end (ap);
-}
-
-/* Trigger an objc error */
-void
-objc_verror (id object, int code, const char *fmt, va_list ap)
-{
-  BOOL result = NO;
-
-  /* Call the error handler if its there
-     Otherwise print to stderr */
-  if (_objc_error_handler)
-    result = (*_objc_error_handler) (object, code, fmt, ap);
-  else
-    vfprintf (stderr, fmt, ap);
-
-  /* Continue if the error handler says its ok
-     Otherwise abort the program */
-  if (result)
-    return;
-  else
-    abort ();
-}
-
-/* Set the error handler */
-objc_error_handler
-objc_set_error_handler (objc_error_handler func)
-{
-  objc_error_handler temp = _objc_error_handler;
-  _objc_error_handler = func;
-  return temp;
-}