Mono runtime: Add support for mixed-mode assemblies. Contributed under MIT/X11 license.

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

diff --git a/ChangeLog b/ChangeLog
index ea3476127152b7dd57c6da80086846697185c02e..9d5df58837d527c427a3389d8c612b171b79de08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-28  Kornél Pál  <kornelpal@gmail.com>
+
+       * include/gc.h: Add GC_DllMain.
+       * win32_threads.c: Rename DllMain to GC_DllMain.
+\r
+       Contributed under MIT/X11 license.\r
+
 2008-04-15  Jonathan Chambers  <joncham@gmail.com>
        * include/private/gcconfig.h: Backport GC7 code to support Win64.
        * win32_threads.c: Backport GC7 code to support Win64.

diff --git a/include/gc.h b/include/gc.h
index 375cc18a554c3a328e1eb988ec269ef21aba1f5a..ef3a06c11f5b47a2cfc9de6e8594d0d972583ceb 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -922,6 +922,8 @@ extern void GC_thr_init(void);      /* Needed for Solaris/X86       */
 #if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
 # include <windows.h>
 
+   BOOL WINAPI GC_DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved);
+
   /*
    * All threads must be created using GC_CreateThread, so that they will be
    * recorded in the thread table.  For backwards compatibility, this is not

diff --git a/win32_threads.c b/win32_threads.c
index deb3eae4e0a24e65a193a0f440b491e3158e5213..a2cd0fda43ee3dbd88bf8d15884bc76c1f35c750 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -782,7 +782,7 @@ int GC_pthread_detach(pthread_t thread)
  * Pontus Rydin suggests wrapping the thread start routine instead.
  */
 #if defined(GC_DLL) || defined(GC_INSIDE_DLL)
-BOOL WINAPI DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved)
+BOOL WINAPI GC_DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved)
 {
   switch (reason) {
   case DLL_PROCESS_ATTACH: