2002-12-12 Juli Mallett <jmallett@FreeBSD.org>

	* gc.h, gc-internal.h: Rename header for GC internal calls to
	gc-internal.h from gc.h as to not clash with Boehm GC having its
	header installed as <gc.h> in outside include paths.
	* appdomain.c, gc.c, icall.c, object.c: Account for aforementioned.
	* threads.c: If SIGRTMIN is not defined, fall back to SIGUSR1.

svn path=/trunk/mono/; revision=9612

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index e0d2b6e7437f297851e2dcb3749a347eb3f66920..a43e834982700d2f6eeba3dae7c53c2c9f36f120 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-12  Juli Mallett  <jmallett@FreeBSD.org>
+
+       * gc.h, gc-internal.h: Rename header for GC internal calls to
+       gc-internal.h from gc.h as to not clash with Boehm GC having its
+       header installed as <gc.h> in outside include paths.
+       * appdomain.c, gc.c, icall.c, object.c: Account for aforementioned.
+       * threads.c: If SIGRTMIN is not defined, fall back to SIGUSR1.
+
 2002-12-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * icall.c: assign minor, build and revision in FillName.

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index f0ff0249bae854749ab49fb3b6d29eae516faf25..7246f776cadab32887b6250c6a60e27bf9396e14 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -20,7 +20,7 @@
 #include <mono/metadata/threads.h>
 #include <mono/metadata/socket-io.h>
 #include <mono/metadata/tabledefs.h>
-#include <mono/metadata/gc.h>
+#include <mono/metadata/gc-internal.h>
 
 HANDLE mono_delegate_semaphore = NULL;
 CRITICAL_SECTION mono_delegate_section;

diff --git a/mono/metadata/gc-internal.h b/mono/metadata/gc-internal.h
new file mode 100644 (file)
index 0000000..1507746
--- /dev/null
+++ b/mono/metadata/gc-internal.h
@@ -0,0 +1,32 @@
+/*
+ * metadata/gc-internal.h: GC icalls.
+ *
+ * Author: Paolo Molaro <lupus@ximian.com>
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef __MONO_METADATA_GC_H__
+#define __MONO_METADATA_GC_H__
+
+#include <glib.h>
+#include <mono/metadata/object.h>
+
+void   mono_object_register_finalizer               (MonoObject  *obj);
+void   ves_icall_System_GC_InternalCollect          (int          generation);
+gint64 ves_icall_System_GC_GetTotalMemory           (MonoBoolean  forceCollection);
+void   ves_icall_System_GC_KeepAlive                (MonoObject  *obj);
+void   ves_icall_System_GC_ReRegisterForFinalize    (MonoObject  *obj);
+void   ves_icall_System_GC_SuppressFinalize         (MonoObject  *obj);
+void   ves_icall_System_GC_WaitForPendingFinalizers (void);
+
+MonoObject *ves_icall_System_GCHandle_GetTarget (guint32 handle);
+guint32     ves_icall_System_GCHandle_GetTargetHandle (MonoObject *obj, guint32 handle, gint32 type);
+void        ves_icall_System_GCHandle_FreeHandle (guint32 handle);
+gpointer    ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle);
+
+extern void mono_gc_init (void);
+extern void mono_gc_cleanup (void);
+
+#endif /* __MONO_METADATA_GC_H__ */
+

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index e22999a465f6134dfc411e2d3c03e8ac387a07a5..a35c128bc7688492a7861d756e7f6152021a86c7 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -10,7 +10,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include <mono/metadata/gc.h>
+#include <mono/metadata/gc-internal.h>
 #include <mono/metadata/threads.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/exception.h>

diff --git a/mono/metadata/gc.h b/mono/metadata/gc.h
deleted file mode 100644 (file)
index daeee9d..0000000
--- a/mono/metadata/gc.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * metadata/gc.h: GC icalls.
- *
- * Author: Paolo Molaro <lupus@ximian.com>
- *
- * (C) 2002 Ximian, Inc.
- */
-
-#ifndef __MONO_METADATA_GC_H__
-#define __MONO_METADATA_GC_H__
-
-#include <glib.h>
-#include <mono/metadata/object.h>
-
-void   mono_object_register_finalizer               (MonoObject  *obj);
-void   ves_icall_System_GC_InternalCollect          (int          generation);
-gint64 ves_icall_System_GC_GetTotalMemory           (MonoBoolean  forceCollection);
-void   ves_icall_System_GC_KeepAlive                (MonoObject  *obj);
-void   ves_icall_System_GC_ReRegisterForFinalize    (MonoObject  *obj);
-void   ves_icall_System_GC_SuppressFinalize         (MonoObject  *obj);
-void   ves_icall_System_GC_WaitForPendingFinalizers (void);
-
-MonoObject *ves_icall_System_GCHandle_GetTarget (guint32 handle);
-guint32     ves_icall_System_GCHandle_GetTargetHandle (MonoObject *obj, guint32 handle, gint32 type);
-void        ves_icall_System_GCHandle_FreeHandle (guint32 handle);
-gpointer    ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle);
-
-extern void mono_gc_init (void);
-extern void mono_gc_cleanup (void);
-
-#endif /* __MONO_METADATA_GC_H__ */
-

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 8904ecfa1a9b72699d421696586e5a0a34578a53..283db44ddd370be4ec58b71ce77a743c9c9f0b36 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -32,7 +32,7 @@
 #include <mono/metadata/unicode.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/marshal.h>
-#include <mono/metadata/gc.h>
+#include <mono/metadata/gc-internal.h>
 #include <mono/metadata/rand.h>
 #include <mono/metadata/sysmath.h>
 #include <mono/metadata/string-icalls.h>

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 395a10a6404d52e8f2220354b74762f017bafbad..c32bc3ff5230a5deaf93b44dd89706be7345fa32 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -16,7 +16,7 @@
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/object.h>
-#include <mono/metadata/gc.h>
+#include <mono/metadata/gc-internal.h>
 #include <mono/metadata/exception.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index dd6044fe9d3dfb2a2c9353e2b27c78a3d37f9bd2..f794d24489f312324614e6c0b5f4e0b69f6c2c2d 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -1134,6 +1134,9 @@ ves_icall_System_Threading_Thread_Abort (MonoThread *thread, MonoObject *state)
 
        /* fixme: store the state somewhere */
 #ifndef __MINGW32__
+#ifndef        SIGRTMIN
+#define        SIGRTMIN        SIGUSR1
+#endif
 #ifdef PTHREAD_POINTER_ID
        pthread_kill (GUINT_TO_POINTER(thread->tid), SIGRTMIN);
 #else