diff options
| author | Martin Baulig <martin@novell.com> | 2006-01-21 17:44:07 +0300 |
|---|---|---|
| committer | Martin Baulig <martin@novell.com> | 2006-01-21 17:44:07 +0300 |
| commit | 6e2a247bf71a58e010e86df1573260adaf9a5a1b (patch) | |
| tree | dce59f52788fb7e55f0cbf0e88b0fededabbfbad /libgc | |
| parent | de22929eb084a312e1fc7bc298e41dd599bb5913 (diff) | |
**** Merged 55879 from HEAD ****
svn path=/branches/mono-1-1-13/mono/; revision=55881
Diffstat (limited to 'libgc')
| -rw-r--r-- | libgc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgc/include/libgc-mono-debugger.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgc/ChangeLog b/libgc/ChangeLog index c26cb699653..c68cfd863af 100644 --- a/libgc/ChangeLog +++ b/libgc/ChangeLog @@ -1,3 +1,8 @@ +2006-01-21 Martin Baulig <martin@ximian.com> + + * include/libgc-mono-debugger.h: Call the conditional + `_IN_THE_MONO_DEBUGGER', not `IN_MONO_DEBUGGER'. + 2006-01-03 Geoff Norton <gnorton@customerdna.com> * darwin_stop_world.c: Merge a patch from Bruce Mitchener that fixes a small diff --git a/libgc/include/libgc-mono-debugger.h b/libgc/include/libgc-mono-debugger.h index eea5808cda6..624e845005c 100644 --- a/libgc/include/libgc-mono-debugger.h +++ b/libgc/include/libgc-mono-debugger.h @@ -1,7 +1,7 @@ #ifndef LIBGC_MONO_DEBUGGER_H #define LIBGC_MONO_DEBUGGER_H -#if defined(_IN_LIBGC_GC_H) || defined(IN_MONO_DEBUGGER) +#if defined(_IN_LIBGC_GC_H) || defined(_IN_THE_MONO_DEBUGGER) typedef struct { |