diff options
| author | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-17 16:35:15 +0000 |
|---|---|---|
| committer | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-17 16:35:15 +0000 |
| commit | 1a46e3f104bdc3c8fb448e7ed91339918a7c1a20 (patch) | |
| tree | 7c97648ea44e24d40bac796f8c61ad41803b5b07 /libobjc/objc/objc-api.h | |
| parent | 18a02cd3fae0cca4833d2be65b7098f68bb18427 (diff) | |
| download | ppe42-gcc-1a46e3f104bdc3c8fb448e7ed91339918a7c1a20.tar.gz ppe42-gcc-1a46e3f104bdc3c8fb448e7ed91339918a7c1a20.zip | |
In libobjc/:
* objc/hash.h: Moved into objc/deprecated/hash.h; objc/hash.h
replaced with a placeholder including the file from the
deprecated/ directory.
* objc/objc-api.h: Updated includes.
* objc/typedstream.h: Updated includes.
* objc-private/hash.h: New file (private copy of hash.h).
* objc/objc-list.h: Moved into objc/deprecated/objc-list.h;
objc/objc-list.h replaced with a placeholder including the file
from the deprecated/ directory.
* objc-private/objc-list.h: New file (private copy of objc-list.h).
* init.c: Include objc-private/hash.h and objc-private/objc-list.h
instead of objc/hash.h and objc/objc-list.h.
* selector.c: Same change.
* class.c: Added include <string.h>, which used to be implicitly included
when hash.h was included.
* exception.c: Same change.
* objects.c: Same change.
* sarray.c: Same change.
* sendmsg.c: Same change.
* Makefile.in (OBJC_DEPRECATED_H): Added hash.h and objc-list.h.
(OBJC_H): Removed hash.h and objc-list.h
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164373 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/objc/objc-api.h')
| -rw-r--r-- | libobjc/objc/objc-api.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h index 9fff9e1d155..524515a908d 100644 --- a/libobjc/objc/objc-api.h +++ b/libobjc/objc/objc-api.h @@ -28,7 +28,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define __objc_api_INCLUDE_GNU #include "objc.h" -#include "hash.h" +#ifndef GNU_LIBOBJC_COMPILING_LIBOBJC_ITSELF +# include "deprecated/hash.h" +#endif #include "thr.h" #include "objc-decls.h" #include <stdio.h> |

