archive.c, [...]: Include hash.h.

2005-06-07  David Ayers  <d.ayers@inode.at>

	* archive.c, init.c, selector.c: Include hash.h.
	* archive.c, class.c, encoding.c, gc.c, hash.c, hash_compat.c,
	init.c, misc.c, nil_method.c, objects.c, sarray.c, selector.c,
	sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c, thr-mach.c,
	thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c, thr-rtems.c,
	thr-single.c, thr-solaris.c, thr-vxworks.c, thr-win32.c, thr.c:
	Include Objective-C headers with quotes and objc/ directory
	prefix.

From-SVN: r100723

28 files changed, 66 insertions, 55 deletions

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index c4d0abfa8ce..59a861ec999 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-07  David Ayers  <d.ayers@inode.at>
+
+	* archive.c, init.c, selector.c: Include hash.h.
+	* archive.c, class.c, encoding.c, gc.c, hash.c, hash_compat.c,
+	init.c, misc.c, nil_method.c, objects.c, sarray.c, selector.c,
+	sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c, thr-mach.c,
+	thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c, thr-rtems.c,
+	thr-single.c, thr-solaris.c, thr-vxworks.c, thr-win32.c, thr.c:
+	Include Objective-C headers with quotes and objc/ directory
+	prefix.
+
 2005-05-19  Richard Henderson  <rth@redhat.com>
 
 	* exception.c: Revert last change.
diff --git a/libobjc/archive.c b/libobjc/archive.c
index 5c3616ca329..3bfd975a18a 100644
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include "tconfig.h"
-#include "runtime.h"
-#include "typedstream.h"
-#include "encoding.h"
+#include "objc/runtime.h"
+#include "objc/typedstream.h"
+#include "objc/encoding.h"
 #include <stdlib.h>
 
 extern int fflush (FILE *);
diff --git a/libobjc/class.c b/libobjc/class.c
index 9638f5d3784..2140652ff1e 100644
--- a/libobjc/class.c
+++ b/libobjc/class.c
@@ -88,12 +88,12 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   classes from the table - and the difficult thing with lock-free data
   structures is freeing data when is removed from the structures.  */
 
-#include "runtime.h"            /* the kitchen sink */
-#include "sarray.h"
+#include "objc/runtime.h"            /* the kitchen sink */
+#include "objc/sarray.h"
 
-#include <objc/objc.h>
-#include <objc/objc-api.h>
-#include <objc/thr.h>
+#include "objc/objc.h"
+#include "objc/objc-api.h"
+#include "objc/thr.h"
 
 /* We use a table which maps a class name to the corresponding class
  * pointer.  The first part of this file defines this table, and
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index 7f71276b556..95cf6527736 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -32,8 +32,8 @@ Boston, MA 02111-1307, USA.  */
 #include "tconfig.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "objc-api.h"
-#include "encoding.h"
+#include "objc/objc-api.h"
+#include "objc/encoding.h"
 #include <stdlib.h>
 
 #undef  MAX
diff --git a/libobjc/gc.c b/libobjc/gc.c
index 66aa78a32ee..a4766894ab3 100644
--- a/libobjc/gc.c
+++ b/libobjc/gc.c
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
    the executable file might be covered by the GNU General Public License.  */
 
 #include "tconfig.h"
-#include "objc.h"
-#include "encoding.h"
+#include "objc/objc.h"
+#include "objc/encoding.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libobjc/hash.c b/libobjc/hash.c
index e2072b605f7..a32279cd7a7 100644
--- a/libobjc/hash.c
+++ b/libobjc/hash.c
@@ -26,9 +26,9 @@ Boston, MA 02111-1307, USA.  */
 
 #include "assert.h"
 
-#include "hash.h"
+#include "objc/hash.h"
 
-#include "runtime.h"		/* for DEBUG_PRINTF */
+#include "objc/runtime.h"		/* for DEBUG_PRINTF */
 
 /* These two macros determine when a hash table is full and
    by how much it should be expanded respectively.
diff --git a/libobjc/hash_compat.c b/libobjc/hash_compat.c
index 46c273858a6..905b9e43c67 100644
--- a/libobjc/hash_compat.c
+++ b/libobjc/hash_compat.c
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
    the executable file might be covered by the GNU General Public License.  */
 
 #define OBJC_IGNORE_DEPRECATED_API 1
-#include "hash.h"
+#include "objc/hash.h"
 
 cache_ptr
 hash_new (unsigned int size,
diff --git a/libobjc/init.c b/libobjc/init.c
index 3eb53866f38..40d9016e239 100644
--- a/libobjc/init.c
+++ b/libobjc/init.c
@@ -24,7 +24,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include "runtime.h"
+#include "objc/runtime.h"
 
 /* The version number of this runtime.  This must match the number 
    defined in gcc (objc-act.c).  */
diff --git a/libobjc/misc.c b/libobjc/misc.c
index 3ae8a55cfe6..fd9561f4544 100644
--- a/libobjc/misc.c
+++ b/libobjc/misc.c
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define __USE_FIXED_PROTOTYPES__
 #include <stdlib.h>
-#include "runtime.h"
+#include "objc/runtime.h"
 
 /*
 ** Error handler function
diff --git a/libobjc/nil_method.c b/libobjc/nil_method.c
index d35ccdc92bb..e1802aa107d 100644
--- a/libobjc/nil_method.c
+++ b/libobjc/nil_method.c
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 /* This is the nil method, the function that is called when the receiver
    of a method is nil */
 
-#include "runtime.h"
+#include "objc/runtime.h"
 
 /* When the receiver of a method invocation is nil, the runtime
    returns nil_method() as the method implementation.  This function
diff --git a/libobjc/objects.c b/libobjc/objects.c
index e4920a650a8..c3732e3a444 100644
--- a/libobjc/objects.c
+++ b/libobjc/objects.c
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include "tconfig.h"         /* include defs of bzero for target */
-#include "objc.h"
-#include "runtime.h"		/* the kitchen sink */
+#include "objc/objc.h"
+#include "objc/runtime.h"		/* the kitchen sink */
 
 #if OBJC_WITH_GC
 # include <gc.h>
diff --git a/libobjc/sarray.c b/libobjc/sarray.c
index e7e69a9e8ce..f07097ac209 100644
--- a/libobjc/sarray.c
+++ b/libobjc/sarray.c
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
    This exception does not however invalidate any other reasons why
    the executable file might be covered by the GNU General Public License.  */
 
-#include "sarray.h"
-#include "runtime.h"
+#include "objc/sarray.h"
+#include "objc/runtime.h"
 #include <stdio.h>
 #include "assert.h"
 
diff --git a/libobjc/selector.c b/libobjc/selector.c
index ce8acf7ac3a..86673339bfb 100644
--- a/libobjc/selector.c
+++ b/libobjc/selector.c
@@ -23,9 +23,9 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include "runtime.h"
-#include "sarray.h"
-#include "encoding.h"
+#include "objc/runtime.h"
+#include "objc/sarray.h"
+#include "objc/encoding.h"
 
 /* Initial selector hash table size. Value doesn't matter much */
 #define SELECTOR_HASH_SIZE 128
diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c
index f0b5bbb35c2..414af70ed6d 100644
--- a/libobjc/sendmsg.c
+++ b/libobjc/sendmsg.c
@@ -32,9 +32,9 @@ Boston, MA 02111-1307, USA.  */
 #include "tconfig.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "runtime.h"
-#include "sarray.h"
-#include "encoding.h"
+#include "objc/runtime.h"
+#include "objc/sarray.h"
+#include "objc/encoding.h"
 #include "runtime-info.h"
 
 /* This is how we hack STRUCT_VALUE to be 1 or 0.   */
diff --git a/libobjc/thr-dce.c b/libobjc/thr-dce.c
index 8350db2e0bb..166d61f6f21 100644
--- a/libobjc/thr-dce.c
+++ b/libobjc/thr-dce.c
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <pthread.h>
-#include <thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Key structure for maintaining thread specific storage */
 static pthread_key_t _objc_thread_storage;
diff --git a/libobjc/thr-decosf1.c b/libobjc/thr-decosf1.c
index cfb2cbc487f..166d61f6f21 100644
--- a/libobjc/thr-decosf1.c
+++ b/libobjc/thr-decosf1.c
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <pthread.h>
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Key structure for maintaining thread specific storage */
 static pthread_key_t _objc_thread_storage;
diff --git a/libobjc/thr-irix.c b/libobjc/thr-irix.c
index 6eb06ec48ec..9ad55bb3be2 100644
--- a/libobjc/thr-irix.c
+++ b/libobjc/thr-irix.c
@@ -29,8 +29,8 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/sysmp.h>
 #include <sys/prctl.h>
 #include <ulocks.h>
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Key structure for maintaining thread specific storage */
 static void * __objc_shared_arena_handle = NULL;
diff --git a/libobjc/thr-mach.c b/libobjc/thr-mach.c
index b0f864d7100..7d70625562e 100644
--- a/libobjc/thr-mach.c
+++ b/libobjc/thr-mach.c
@@ -28,8 +28,8 @@ Boston, MA 02111-1307, USA.  */
 
 #include <mach/mach.h>
 #include <mach/cthreads.h>
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /*
   Obtain the maximum thread priority that can set for t.  Under the
diff --git a/libobjc/thr-objc.c b/libobjc/thr-objc.c
index d954f937154..25f9762b086 100644
--- a/libobjc/thr-objc.c
+++ b/libobjc/thr-objc.c
@@ -29,8 +29,8 @@ Boston, MA 02111-1307, USA.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "defaults.h"
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 #include <gthr.h>
 
 /* Backend initialization functions */
diff --git a/libobjc/thr-os2.c b/libobjc/thr-os2.c
index d43d225650c..e302006ab19 100644
--- a/libobjc/thr-os2.c
+++ b/libobjc/thr-os2.c
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSPROCESS
diff --git a/libobjc/thr-posix.c b/libobjc/thr-posix.c
index 710bebf30e6..9871b57691f 100644
--- a/libobjc/thr-posix.c
+++ b/libobjc/thr-posix.c
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 #include <pthread.h>
 
 /* Key structure for maintaining thread specific storage */
diff --git a/libobjc/thr-pthreads.c b/libobjc/thr-pthreads.c
index c00c6016bff..99321c8e93f 100644
--- a/libobjc/thr-pthreads.c
+++ b/libobjc/thr-pthreads.c
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <pcthread.h>
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Key structure for maintaining thread specific storage */
 static pthread_key_t _objc_thread_storage;
diff --git a/libobjc/thr-rtems.c b/libobjc/thr-rtems.c
index 8683d769d5c..eab88924056 100644
--- a/libobjc/thr-rtems.c
+++ b/libobjc/thr-rtems.c
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Thread local storage for a single thread */
 static void *thread_local_storage = NULL;
diff --git a/libobjc/thr-single.c b/libobjc/thr-single.c
index 24ab5d7b630..132307448e7 100644
--- a/libobjc/thr-single.c
+++ b/libobjc/thr-single.c
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Thread local storage for a single thread */
 static void *thread_local_storage = NULL;
diff --git a/libobjc/thr-solaris.c b/libobjc/thr-solaris.c
index 447d0c45f9e..d37013b132d 100644
--- a/libobjc/thr-solaris.c
+++ b/libobjc/thr-solaris.c
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 #include <thread.h>
 #include <synch.h>
diff --git a/libobjc/thr-vxworks.c b/libobjc/thr-vxworks.c
index 24ab5d7b630..132307448e7 100644
--- a/libobjc/thr-vxworks.c
+++ b/libobjc/thr-vxworks.c
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 /* Thread local storage for a single thread */
 static void *thread_local_storage = NULL;
diff --git a/libobjc/thr-win32.c b/libobjc/thr-win32.c
index 3447a02d65a..065242ce8ff 100644
--- a/libobjc/thr-win32.c
+++ b/libobjc/thr-win32.c
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include <objc/thr.h>
-#include "runtime.h"
+#include "objc/thr.h"
+#include "objc/runtime.h"
 
 #ifndef __OBJC__
 #define __OBJC__
diff --git a/libobjc/thr.c b/libobjc/thr.c
index 7420cfaf2d0..91e15d52252 100644
--- a/libobjc/thr.c
+++ b/libobjc/thr.c
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <stdlib.h>
-#include "runtime.h"
+#include "objc/runtime.h"
 
 /* Global exit status. */
 int __objc_thread_exit_status = 0;