2011-06-08 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk rev 174972 using svnmerge
	also patched fixincludes/genfixes



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@174797 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 16 deletions

diff --git a/libobjc/objc/objc.h b/libobjc/objc/objc.h
index 8719269bb35..c0d58e1cd11 100644
--- a/libobjc/objc/objc.h
+++ b/libobjc/objc/objc.h
@@ -36,11 +36,6 @@ extern "C" {
 
 #include <stddef.h>
 
-/* objc-decls.h is included because deprecated/objc_msg_sendv.h needs
-   it.  When that goes away, the include of objc-decls.h should be
-   removed.  */
-#include "objc-decls.h"
-
 /* The current version of the GNU Objective-C Runtime library in
    compressed ISO date format.  This should be updated any time a new
    version is released with changes to the public API (there is no
@@ -76,15 +71,12 @@ typedef unsigned char  BOOL;
    selector and know that the class implements it, you can use it to
    call the method for an object in the class.  */
 typedef const struct objc_selector *SEL;
-#include "deprecated/struct_objc_selector.h"
 
 /* A Class is a class (in the object-oriented sense).  In Objective-C
    there is the complication that each Class is an object itself, and
    so belongs to a class too.  This class that a class belongs to is
    called its 'meta class'.  */
 typedef struct objc_class *Class;
-#include "deprecated/MetaClass.h"
-#include "deprecated/struct_objc_class.h"
 
 /* An 'id' is an object of an unknown class.  The way the object data
    is stored inside the object is private and what you see here is
@@ -140,18 +132,11 @@ typedef id (*IMP)(id, SEL, ...);
      there is no reason to even define a 'struct objc_protocol'.  As
      all the structure details will be hidden, a Protocol basically is
      simply an object (as it should be).  */
-  /* typedef struct objc_object Protocol; */
-  #include "deprecated/struct_objc_protocol.h"
+  typedef struct objc_object Protocol;
 #else /* __OBJC__ */
   @class Protocol;
 #endif 
 
-/* Deprecated include - here temporarily, for backwards-compatibility
-   as reval_t, apply_t, arglist_t and objc_msg_lookup() used to be
-   defined here.  objc_msg_lookup() is now defined in message.h,
-   included by objc-api.h or runtime.h.  */
-#include "deprecated/objc_msg_sendv.h"
-
 /* Compatibility note: the Apple/NeXT runtime defines sel_getName(),
    sel_registerName(), object_getClassName(), object_getIndexedIvars()
    in this file while the GNU runtime defines them in runtime.h.