diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-09-17 16:35:15 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-09-17 16:35:15 +0000 |
| commit | 5be9cdc112d455a0799a2440b1a52e2b0d23da82 (patch) | |
| tree | 7c97648ea44e24d40bac796f8c61ad41803b5b07 /libobjc/objc | |
| parent | 0982fd6497be2ef3879b60443b657efad1966835 (diff) | |
| download | gcc-5be9cdc112d455a0799a2440b1a52e2b0d23da82.zip gcc-5be9cdc112d455a0799a2440b1a52e2b0d23da82.tar.gz gcc-5be9cdc112d455a0799a2440b1a52e2b0d23da82.tar.bz2 | |
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
From-SVN: r164373
Diffstat (limited to 'libobjc/objc')
| -rw-r--r-- | libobjc/objc/deprecated/hash.h (renamed from libobjc/objc/hash.h) | 1 | ||||
| -rw-r--r-- | libobjc/objc/deprecated/objc-list.h (renamed from libobjc/objc/objc-list.h) | 0 | ||||
| -rw-r--r-- | libobjc/objc/objc-api.h | 4 | ||||
| -rw-r--r-- | libobjc/objc/typedstream.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/libobjc/objc/hash.h b/libobjc/objc/deprecated/hash.h index 146abd9..52ee8c3 100644 --- a/libobjc/objc/hash.h +++ b/libobjc/objc/deprecated/hash.h @@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include <stddef.h> #include <string.h> -#include "objc.h" #ifdef __cplusplus extern "C" { diff --git a/libobjc/objc/objc-list.h b/libobjc/objc/deprecated/objc-list.h index e542bfc..e542bfc 100644 --- a/libobjc/objc/objc-list.h +++ b/libobjc/objc/deprecated/objc-list.h diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h index 9fff9e1..524515a 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> diff --git a/libobjc/objc/typedstream.h b/libobjc/objc/typedstream.h index 2d4f72d..a39c51b 100644 --- a/libobjc/objc/typedstream.h +++ b/libobjc/objc/typedstream.h @@ -1,4 +1,4 @@ #include "objc.h" -#include "hash.h" +#include "deprecated/hash.h" #include "deprecated/typedstream.h" |