In libobjc/: 2010-12-21 Nicola Pero <nicola.pero@meta-innovation.com>

In libobjc/:
2010-12-21  Nicola Pero  <nicola.pero@meta-innovation.com>

	* objc-private/runtime.h (DEBUG_PRINTF): Moved from here ...
	* objc-private/common.h (DEBUG_PRINTF): To here.
	* hash.c: Do not include objc-private/runtime.h and objc/thr.h.

From-SVN: r168111

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index d784696f3fe8f3c0cc51c12f16d4501b0c0c0563..89e81715ec6ab9f2a56760ffc71dfe7156c67ffe 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-21  Nicola Pero  <nicola.pero@meta-innovation.com>
+       
+       * objc-private/runtime.h (DEBUG_PRINTF): Moved from here ...
+       * objc-private/common.h (DEBUG_PRINTF): To here.
+       * hash.c: Do not include objc-private/runtime.h and objc/thr.h.
+       
 2010-12-21  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * hash.c: Tidied up comments and indentation.  No code changes.

diff --git a/libobjc/hash.c b/libobjc/hash.c
index e699f024172ddea9e4cef3cc8d48f295b83c152a..138a2504db252b723283564c219f7f58b264b8e3 100644 (file)
--- a/libobjc/hash.c
+++ b/libobjc/hash.c
@@ -26,9 +26,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <assert.h>               /* For assert.  */
 
 #include "objc/runtime.h"         /* For objc_calloc.  */
-#include "objc/thr.h"             /* Required by objc-private/runtime.h.  */
 #include "objc-private/hash.h"
-#include "objc-private/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/objc-private/common.h b/libobjc/objc-private/common.h
index 1642faa513904edd88960891f699766941ba644f..cbb335b8f83d3fd6fecbbaa5fbf46810611451d9 100644 (file)
--- a/libobjc/objc-private/common.h
+++ b/libobjc/objc-private/common.h
@@ -26,13 +26,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define __objc_private_common_INCLUDE_GNU
 
 /* This file contains definitions that should be included by all .c
-   and .m files in libobjc.
-*/
+   and .m files in libobjc.  */
 
 /* This variable allows the public headers to determine when they are
    being included by a file inside libobjc itself, or when they are
-   being included by an external file.
-*/
+   being included by an external file.  */
 #define GNU_LIBOBJC_COMPILING_LIBOBJC_ITSELF 1
 
+#ifdef DEBUG
+#define DEBUG_PRINTF(format, args...) printf (format, ## args)
+#else
+#define DEBUG_PRINTF(format, args...)
+#endif 
+
 #endif /* __objc_private_common_INCLUDE_GNU */

diff --git a/libobjc/objc-private/runtime.h b/libobjc/objc-private/runtime.h
index ba01f5762279240c4154dc1263a4a7aeaf81ebbe..5fd07448183173c783d8410841af4f84abe1265a 100644 (file)
--- a/libobjc/objc-private/runtime.h
+++ b/libobjc/objc-private/runtime.h
@@ -77,12 +77,6 @@ extern objc_mutex_t __objc_runtime_mutex;
 /* Number of threads which are alive. */
 extern int __objc_runtime_threads_alive;
 
-#ifdef DEBUG
-#define DEBUG_PRINTF(format, args...) printf (format, ## args)
-#else
-#define DEBUG_PRINTF(format, args...)
-#endif 
-
 BOOL __objc_responds_to (id object, SEL sel); /* for internal use only! */
 extern void __objc_generate_gc_type_description (Class);