diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-12-21 11:50:14 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-12-21 11:50:14 +0000 |
| commit | 9c68c0e59809906dd3675248ac84a1202ee6182c (patch) | |
| tree | 653a4b51d95f0dd2a3692e94dc65b13dc130d56d /libobjc | |
| parent | 57d75eebe2eb48709fd9086236bb0757778ad617 (diff) | |
| download | gcc-9c68c0e59809906dd3675248ac84a1202ee6182c.zip gcc-9c68c0e59809906dd3675248ac84a1202ee6182c.tar.gz gcc-9c68c0e59809906dd3675248ac84a1202ee6182c.tar.bz2 | |
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
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 6 | ||||
| -rw-r--r-- | libobjc/hash.c | 2 | ||||
| -rw-r--r-- | libobjc/objc-private/common.h | 12 | ||||
| -rw-r--r-- | libobjc/objc-private/runtime.h | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index d784696..89e8171 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,4 +1,10 @@ 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 e699f02..138a250 100644 --- 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 1642faa..cbb335b 100644 --- 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 ba01f57..5fd0744 100644 --- 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); |