diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-04 14:29:13 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-04 14:29:13 +0000 |
| commit | 61c059fcd4ddcc849aae31efce0f1a4866c0d04b (patch) | |
| tree | 807ab884f6921d74cf6697b2fbd57ce212645768 /libobjc/objc/objc.h | |
| parent | 8289bfc6ebd28a7c9ba0ded84bf9103b590a9597 (diff) | |
| download | gcc-61c059fcd4ddcc849aae31efce0f1a4866c0d04b.tar.gz | |
2011-06-04 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 174636 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@174639 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/objc/objc.h')
| -rw-r--r-- | libobjc/objc/objc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libobjc/objc/objc.h b/libobjc/objc/objc.h index ece0f884105..8719269bb35 100644 --- a/libobjc/objc/objc.h +++ b/libobjc/objc/objc.h @@ -125,8 +125,6 @@ typedef id (*IMP)(id, SEL, ...); compiler to do some type-checking. */ #define Nil (Class)0 -#include "deprecated/STR.h" - /* TODO: Move the 'Protocol' declaration into objc/runtime.h. A Protocol is simply an object, not a basic Objective-C type. The Apple runtime defines Protocol in objc/runtime.h too, so it's good |