Fix some merge problems.

diff --git a/mono/metadata/sgen-gc.h b/mono/metadata/sgen-gc.h
index e8ac384be757aa54e0e58b67fa51c60f92e9dca1..10eb26639e30d113cdd1d16601965df26b6e928a 100644 (file)
--- a/mono/metadata/sgen-gc.h
+++ b/mono/metadata/sgen-gc.h
@@ -797,9 +797,6 @@ gboolean mono_sgen_ptr_is_in_los (char *ptr, char **start) MONO_INTERNAL;
 void mono_sgen_los_iterate_objects (IterateObjectCallbackFunc cb, void *user_data) MONO_INTERNAL;
 void mono_sgen_los_iterate_live_block_ranges (sgen_cardtable_block_callback callback) MONO_INTERNAL;
 void mono_sgen_los_scan_card_table (SgenGrayQueue *queue) MONO_INTERNAL;
-=======
-void sgen_collect_major_no_lock (const char *reason) MONO_INTERNAL;;
 FILE *mono_sgen_get_logfile (void) MONO_INTERNAL;
->>>>>>> Share the log file between sgen and the stack marking code.
 
 #endif /* __MONO_SGENGC_H__ */

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 8dc193b6411311285341e2131332567a4944cda1..41e27427f41d74873a89615ca5afa923836139ed 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -1193,7 +1193,7 @@ mono_handle_exception_internal_first_pass (MonoContext *ctx, gpointer obj, gpoin
                
                StackFrameInfo frame;
 
-               unwind_res = mono_find_jit_info_ext (domain, jit_tls, NULL, ctx, &new_ctx, NULL, &lmf, &frame);
+               unwind_res = mono_find_jit_info_ext (domain, jit_tls, NULL, ctx, &new_ctx, NULL, &lmf, NULL, &frame);
                if (unwind_res) {
                        if (frame.type == FRAME_TYPE_DEBUGGER_INVOKE || frame.type == FRAME_TYPE_MANAGED_TO_NATIVE) {
                                *ctx = new_ctx;

diff --git a/mono/mini/mini-gc.c b/mono/mini/mini-gc.c
index 40ac51de40143a46e83a1c43023340c8c90f709f..44ab0326e39451f9c574c49ad08251a4a1a81a26 100644 (file)
--- a/mono/mini/mini-gc.c
+++ b/mono/mini/mini-gc.c
@@ -67,6 +67,8 @@ typedef struct {
 
 #define ALIGN_TO(val,align) ((((mgreg_t)val) + ((align) - 1)) & ~((align) - 1))
 
+#undef DEBUG
+
 #if 0
 /* We don't support debug levels, its all-or-nothing */
 #define DEBUG(s) do { s; fflush (logfile); } while (0)