2005-06-09 Duncan Mak <duncan@novell.com>

	* *.h: Added G_BEGIN_DECLS and G_END_DECLS where appropriate to
	all public headers. Fixes #74919. r=zoltan.

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

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 9767c277f5339b7907ca7e9183d379eb889904be..51ea6d9fffa9c3c7308a6beab5659794148fa8cd 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Duncan Mak  <duncan@novell.com>
+
+       * *.h: Added G_BEGIN_DECLS and G_END_DECLS where appropriate to
+       all public headers. Fixes #74919.
+
 2005-05-30  Zoltan Varga  <vargaz@freemail.hu>
 
        * atomic.h: Add IA64 atomic ops.

diff --git a/mono/io-layer/collection.h b/mono/io-layer/collection.h
index 725bd47077c47436c3883c00e777c34e8eaf5fcd..60013ebf3ff35b594b2e5b86fc9731c7999444f2 100644 (file)
--- a/mono/io-layer/collection.h
+++ b/mono/io-layer/collection.h
@@ -12,6 +12,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define _WAPI_HANDLE_COLLECTION_UPDATE_INTERVAL                10
 #define _WAPI_HANDLE_COLLECTION_EXPIRED_INTERVAL       60
 
@@ -28,8 +30,10 @@
                _wapi_thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_COLLECTION); \
                g_assert (_wapi_thr_ret == 0);  \
        }
-       
+
 extern void _wapi_collection_init (void);
 extern void _wapi_handle_collect (void);
 
+G_END_DECLS
+
 #endif /* _WAPI_COLLECTION_H_ */

diff --git a/mono/io-layer/context.h b/mono/io-layer/context.h
index 3cf0c9718cd55f46be7cdd0c9f958d18a53d6286..2d0e814716c2e65bd2a50d03d02ffc597964a599 100644 (file)
--- a/mono/io-layer/context.h
+++ b/mono/io-layer/context.h
@@ -81,6 +81,10 @@ typedef struct
        guint8 ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
 } WapiContext;
 
+G_BEGIN_DECLS
+
 extern gboolean GetThreadContext(gpointer handle, WapiContext *context);
 
+G_END_DECLS
+
 #endif /* _WAPI_COMPEX_H_ */

diff --git a/mono/io-layer/critical-sections.h b/mono/io-layer/critical-sections.h
index 4ddafddab84a5d011f67cae81a5217e74721e582..ae94cfcf0e90672d7300eddc0d7555bbf90beee5 100644 (file)
--- a/mono/io-layer/critical-sections.h
+++ b/mono/io-layer/critical-sections.h
@@ -15,6 +15,8 @@
 
 #include "mono-mutex.h"
 
+G_BEGIN_DECLS
+
 typedef struct _WapiCriticalSection WapiCriticalSection;
 
 struct _WapiCriticalSection
@@ -31,4 +33,6 @@ extern gboolean TryEnterCriticalSection(WapiCriticalSection *section);
 extern void EnterCriticalSection(WapiCriticalSection *section);
 extern void LeaveCriticalSection(WapiCriticalSection *section);
 
+G_END_DECLS
+
 #endif /* _WAPI_CRITICAL_SECTIONS_H_ */

diff --git a/mono/io-layer/events.h b/mono/io-layer/events.h
index 8d480978c77b641bb335d25d70d5536d27d3ad79..dea6849d65da437d4a784dc7884ab5b7ca83fe9b 100644 (file)
--- a/mono/io-layer/events.h
+++ b/mono/io-layer/events.h
@@ -12,10 +12,14 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 extern gpointer CreateEvent(WapiSecurityAttributes *security, gboolean manual,
                            gboolean initial, const gunichar2 *name);
 extern gboolean PulseEvent(gpointer handle);
 extern gboolean ResetEvent(gpointer handle);
 extern gboolean SetEvent(gpointer handle);
 
+G_END_DECLS
+
 #endif /* _WAPI_EVENTS_H_ */

diff --git a/mono/io-layer/handles.h b/mono/io-layer/handles.h
index 0591baa17cf918609ac92beff5d6d254c7698249..f2b59de55bd692d337febe43c2b46d568b677f28 100644 (file)
--- a/mono/io-layer/handles.h
+++ b/mono/io-layer/handles.h
@@ -12,6 +12,10 @@
 
 #define INVALID_HANDLE_VALUE (gpointer)-1
 
+G_BEGIN_DECLS
+
 extern gboolean CloseHandle(gpointer handle);
 
+G_END_DECLS
+
 #endif /* _WAPI_HANDLES_H_ */

diff --git a/mono/io-layer/io.h b/mono/io-layer/io.h
index a9b68208f4d468c17694b6c078bc762f9c05d7ef..abab516c89f2b2f27992f5e8a9345589ef472ee9 100644 (file)
--- a/mono/io-layer/io.h
+++ b/mono/io-layer/io.h
@@ -15,6 +15,8 @@
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/timefuncs.h"
 
+G_BEGIN_DECLS
+
 typedef struct _WapiSecurityAttributes WapiSecurityAttributes;
 
 struct _WapiSecurityAttributes 
@@ -201,4 +203,6 @@ extern gboolean UnlockFile (gpointer handle, guint32 offset_low,
                            guint32 offset_high, guint32 length_low,
                            guint32 length_high);
 
+G_END_DECLS
+
 #endif /* _WAPI_IO_H_ */

diff --git a/mono/io-layer/mono-mutex.h b/mono/io-layer/mono-mutex.h
index 8f4f3f2c9471961aea76d0586d160ac2caefd0ef..36c37de10b4523c79a2be827c7c31b0ee57f8bbc 100644 (file)
--- a/mono/io-layer/mono-mutex.h
+++ b/mono/io-layer/mono-mutex.h
@@ -33,6 +33,8 @@ extern "C" {
 #include <pthread.h>
 #include <time.h>
 
+G_BEGIN_DECLS
+
 typedef struct {
        pthread_mutex_t mutex;
        gboolean complete;
@@ -88,7 +90,6 @@ typedef struct _mono_mutex_t {
 #define MONO_MUTEX_INITIALIZER { 0, MONO_THREAD_NONE, 0, 0, PTHREAD_MUTEX_INITIALIZER, 0 }
 #define MONO_RECURSIVE_MUTEX_INITIALIZER { 0, MONO_THREAD_NONE, 0, 0, PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER }
 
-
 int mono_mutexattr_init (mono_mutexattr_t *attr);
 int mono_mutexattr_settype (mono_mutexattr_t *attr, int type);
 int mono_mutexattr_gettype (mono_mutexattr_t *attr, int *type);

diff --git a/mono/io-layer/mutexes.h b/mono/io-layer/mutexes.h
index 82aacfdb8794bf295c511d9f145885c96f2f2978..e57feae8b88c23abe7dfc9462f5314e5aa65bfe1 100644 (file)
--- a/mono/io-layer/mutexes.h
+++ b/mono/io-layer/mutexes.h
@@ -12,8 +12,12 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 extern gpointer CreateMutex(WapiSecurityAttributes *security, gboolean owned,
                            const gunichar2 *name);
 extern gboolean ReleaseMutex(gpointer handle);
 
+G_END_DECLS
+
 #endif /* _WAPI_MUTEXES_H_ */

diff --git a/mono/io-layer/processes.h b/mono/io-layer/processes.h
index 6b0005e9a589180bd862a8dde3d4532158d07650..46d566cbca07aedde6a05b254f4b0c39cb985a1b 100644 (file)
--- a/mono/io-layer/processes.h
+++ b/mono/io-layer/processes.h
@@ -15,6 +15,8 @@
 #include <mono/io-layer/handles.h>
 #include <mono/io-layer/access.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
        STARTF_USESHOWWINDOW=0x001,
        STARTF_USESIZE=0x002,
@@ -128,4 +130,6 @@ extern gboolean SetProcessWorkingSetSize (gpointer process, size_t min,
 
 extern gboolean TerminateProcess (gpointer process, gint32 exitCode);
 
+G_END_DECLS
+
 #endif /* _WAPI_PROCESSES_H_ */

diff --git a/mono/io-layer/security.h b/mono/io-layer/security.h
index 8d0d64eb0939e7072d07be022b2175f5c5055b5e..1f91659e965b1946279f2a99e86f1cc57d1fbde6 100644 (file)
--- a/mono/io-layer/security.h
+++ b/mono/io-layer/security.h
@@ -12,7 +12,11 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 extern gboolean ImpersonateLoggedOnUser (gpointer handle);
 extern gboolean RevertToSelf (void);
 
+G_END_DECLS
+
 #endif /* _WAPI_SECURITY_H_ */

diff --git a/mono/io-layer/semaphores.h b/mono/io-layer/semaphores.h
index 7d898b8c6116a5248097ddb91e7ca3211dc75b98..029c3d102016364bc727187f9aaf098860f263ee 100644 (file)
--- a/mono/io-layer/semaphores.h
+++ b/mono/io-layer/semaphores.h
@@ -12,10 +12,13 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 extern gpointer CreateSemaphore(WapiSecurityAttributes *security,
                                gint32 initial, gint32 max,
                                const gunichar2 *name);
 extern gboolean ReleaseSemaphore(gpointer handle, gint32 count,
                                 gint32 *prevcount);
 
+G_END_DECLS
 #endif /* _WAPI_SEMAPHORES_H_ */

diff --git a/mono/io-layer/sockets.h b/mono/io-layer/sockets.h
index 371c63e50d1980830134f152a55fe929679fb969..609c100f6a9e21bdaa82e5ce224e492f564fc01b 100644 (file)
--- a/mono/io-layer/sockets.h
+++ b/mono/io-layer/sockets.h
@@ -20,6 +20,8 @@
 
 #include "mono/io-layer/wapi.h"
 
+G_BEGIN_DECLS
+
 #define WSADESCRIPTION_LEN 256
 #define WSASYS_STATUS_LEN 128
 
@@ -49,4 +51,5 @@ extern int WSAIoctl (guint32 handle, gint32 command,
                     gchar *output, gint o_len, glong *written,
                     void *unused1, void *unused2);
 
+G_END_DECLS
 #endif /* _WAPI_SOCKETS_H_ */

diff --git a/mono/io-layer/system.h b/mono/io-layer/system.h
index 761ec26a3d528d32d614afcd02077242b08fe7ab..390b1776b7d0cab9fbec9e5bd36b6acad3a3b885 100644 (file)
--- a/mono/io-layer/system.h
+++ b/mono/io-layer/system.h
@@ -12,6 +12,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _WapiSystemInfo WapiSystemInfo;
 
 struct _WapiSystemInfo 
@@ -39,4 +41,5 @@ struct _WapiSystemInfo
 
 extern void GetSystemInfo(WapiSystemInfo *info);
 
+G_END_DECLS
 #endif /* _WAPI_SYSTEM_H_ */

diff --git a/mono/io-layer/threads.h b/mono/io-layer/threads.h
index 996788b9d487ed822ca876c0a728663a291fdd5b..56965eb064f08f5fdb6f3a99e202a815899eee7d 100644 (file)
--- a/mono/io-layer/threads.h
+++ b/mono/io-layer/threads.h
@@ -18,6 +18,8 @@
 #include <mono/io-layer/processes.h>
 #include <mono/io-layer/access.h>
 
+G_BEGIN_DECLS
+
 #define TLS_MINIMUM_AVAILABLE 64
 #define TLS_OUT_OF_INDEXES 0xFFFFFFFF
 
@@ -57,5 +59,5 @@ extern void Sleep(guint32 ms);
 extern guint32 SleepEx(guint32 ms, gboolean alertable);
 extern guint32 QueueUserAPC (WapiApcProc apc_callback, gpointer thread_handle, 
                                        gpointer param);
-
+G_END_DECLS
 #endif /* _WAPI_THREADS_H_ */

diff --git a/mono/io-layer/timefuncs.h b/mono/io-layer/timefuncs.h
index 1924a73866e40e58a45f267283e709ba455b680f..2097b85788c644c690baa7103c167bd05c27a21e 100644 (file)
--- a/mono/io-layer/timefuncs.h
+++ b/mono/io-layer/timefuncs.h
@@ -14,6 +14,8 @@
 
 #include "mono/io-layer/wapi.h"
 
+G_BEGIN_DECLS
+
 /* The typical idiom for this struct is to cast it to and from 64bit
  * ints, hence the endian switch.
  */
@@ -32,4 +34,5 @@ extern gboolean QueryPerformanceCounter(WapiLargeInteger *count);
 extern gboolean QueryPerformanceFrequency(WapiLargeInteger *freq);
 extern guint32 GetTickCount (void);
 
+G_END_DECLS
 #endif /* _WAPI_TIME_H_ */

diff --git a/mono/io-layer/wait.h b/mono/io-layer/wait.h
index 9eec987ea8099d5e6ad535d86ac8f958a4cae871..629fe5b3a578c2060d68eced974b7c4abae4edd7 100644 (file)
--- a/mono/io-layer/wait.h
+++ b/mono/io-layer/wait.h
@@ -12,6 +12,8 @@
 
 #include "mono/io-layer/status.h"
 
+G_BEGIN_DECLS
+
 #define MAXIMUM_WAIT_OBJECTS 64
 
 #define INFINITE               0xFFFFFFFF
@@ -35,4 +37,5 @@ extern guint32 WaitForMultipleObjects(guint32 numobjects, gpointer *handles,
 extern guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
                                      gboolean waitall, guint32 timeout, gboolean alertable);
 
+G_END_DECLS
 #endif /* _WAPI_WAIT_H_ */

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index db025b140df0711cc6a32d57f14f37826b768aa5..daa43e12f57e51203864391d54ddfb4804e248f6 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Duncan Mak  <duncan@novell.com>
+
+       * *.h: Added G_BEGIN_DECLS and G_END_DECLS where appropriate to
+       all public headers. Fixes #74919.
+
 2005-06-09  Lluis Sanchez Gual  <lluis@novell.com>
 
        * domain.c: The key for proxy_vtable_hash is now a pointer

diff --git a/mono/metadata/appdomain.h b/mono/metadata/appdomain.h
index 546bab4db39244b1464997c9fe8841b5be1869fd..f5d20d8b022f03e43f1d46f79b26158803a11c2c 100644 (file)
--- a/mono/metadata/appdomain.h
+++ b/mono/metadata/appdomain.h
@@ -16,6 +16,8 @@
 #include <mono/metadata/reflection.h>
 #include <mono/metadata/mempool.h>
 
+G_BEGIN_DECLS
+
 typedef void (*MonoThreadStartCB) (guint32 tid, gpointer stack_start,
                                   gpointer func);
 typedef void (*MonoThreadAttachCB) (guint32 tid, gpointer stack_start);
@@ -179,5 +181,6 @@ mono_get_thread_class       (void);
 MonoClass*
 mono_get_exception_class    (void);
 
+G_END_DECLS
 #endif /* _MONO_METADATA_APPDOMAIN_H_ */
 

diff --git a/mono/metadata/assembly.h b/mono/metadata/assembly.h
index 8208ad9ef117a8bd020b54347829b720bfcd9042..48cef0eb7740e43c584596bb9450b034fdfd508a 100644 (file)
--- a/mono/metadata/assembly.h
+++ b/mono/metadata/assembly.h
@@ -5,6 +5,8 @@
 
 #include <mono/metadata/image.h>
 
+G_BEGIN_DECLS
+
 void          mono_assemblies_init     (void);
 MonoAssembly *mono_assembly_open       (const char *filename,
                                        MonoImageOpenStatus *status);
@@ -78,5 +80,6 @@ typedef struct {
 void          mono_register_bundled_assemblies (const MonoBundledAssembly **assemblies);
 void          mono_register_config_for_assembly (const char* assembly_name, const char* config_xml);
 
+G_END_DECLS
 #endif
 

diff --git a/mono/metadata/class.h b/mono/metadata/class.h
index 5b2fe944c502b6e42b0dad85cfdd17cbe5157c0c..8ab544486a5b503e78e48e03b38411a20e6767c1 100644 (file)
--- a/mono/metadata/class.h
+++ b/mono/metadata/class.h
@@ -5,6 +5,8 @@
 #include <mono/metadata/image.h>
 #include <mono/metadata/loader.h>
 
+G_BEGIN_DECLS
+
 typedef struct MonoVTable MonoVTable;
 
 typedef struct _MonoClassField MonoClassField;
@@ -253,4 +255,6 @@ mono_class_get_method_from_name (MonoClass *klass, const char *name, int param_c
 char *
 mono_class_name_from_token (MonoImage *image, guint32 type_token, MonoGenericContext *context);
 
+G_END_DECLS
+
 #endif /* _MONO_CLI_CLASS_H_ */

diff --git a/mono/metadata/debug-helpers.h b/mono/metadata/debug-helpers.h
index 56fbaddf9f7ed6174b96b1a81b973dfaa44e0b7d..ee6924fb6823f300f9b1995431e0bb178a75929b 100644 (file)
--- a/mono/metadata/debug-helpers.h
+++ b/mono/metadata/debug-helpers.h
@@ -4,6 +4,8 @@
 #include <glib.h>
 #include <mono/metadata/class.h>
 
+G_BEGIN_DECLS
+
 typedef struct MonoDisHelper MonoDisHelper;
 
 typedef char* (*MonoDisIndenter) (MonoDisHelper *dh, MonoMethod *method, guint32 ip_offset);
@@ -38,5 +40,7 @@ MonoMethod*     mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImag
 
 char*           mono_method_full_name (MonoMethod *method, gboolean signature);
 
+G_END_DECLS
+
 #endif /* __MONO_DEBUG_HELPERS_H__ */
 

diff --git a/mono/metadata/debug-mono-symfile.h b/mono/metadata/debug-mono-symfile.h
index c9cf138c52946c07da7417263ca0700448d9ed4e..7e7019641203671f1cc785e66b479f42d0ae7518 100644 (file)
--- a/mono/metadata/debug-mono-symfile.h
+++ b/mono/metadata/debug-mono-symfile.h
@@ -129,6 +129,8 @@ struct _MonoSymbolFile {
 #define MONO_SYMBOL_FILE_VERSION               38
 #define MONO_SYMBOL_FILE_MAGIC                 0x45e82623fd7fa614ULL
 
+G_BEGIN_DECLS
+
 MonoSymbolFile *
 mono_debug_open_mono_symbol_file   (MonoDebugHandle           *handle,
                                    gboolean                   create_symfile);
@@ -149,6 +151,7 @@ _mono_debug_address_from_il_offset (MonoDebugMethodJitInfo   *jit,
 MonoDebugMethodInfo *
 mono_debug_find_method             (MonoDebugHandle           *handle,
                                    MonoMethod               *method);
+G_END_DECLS
 
 #endif /* __MONO_SYMFILE_H__ */
 

diff --git a/mono/metadata/environment.h b/mono/metadata/environment.h
index 4749fa720f84e7c475cf37694378acf79ba0216f..4493a7db7ba3d5737a8b13a4528b9b404ef31137 100644 (file)
--- a/mono/metadata/environment.h
+++ b/mono/metadata/environment.h
@@ -10,9 +10,13 @@
 #ifndef _MONO_METADATA_ENVIRONMENT_H_
 #define _MONO_METADATA_ENVIRONMENT_H_
 
+G_BEGIN_DECLS
+
 extern gint32 mono_environment_exitcode_get (void);
 extern void mono_environment_exitcode_set (gint32 value);
 
 extern MonoString* ves_icall_System_Environment_GetOSVersionString (void);
 
+G_END_DECLS
+
 #endif /* _MONO_METADATA_ENVIRONMENT_H_ */

diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index bd38e7887d06aa3cd2ca534aac800c62dbab7684..66a8d3a19cd2ad265a765e1a12988e05e41ec4cf 100644 (file)
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -7,6 +7,8 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/image.h>
 
+G_BEGIN_DECLS
+
 extern MonoException *
 mono_exception_from_name               (MonoImage *image, 
                                        const char* name_space, 
@@ -115,4 +117,6 @@ mono_get_exception_stack_overflow (void);
 MonoException *
 mono_get_exception_reflection_type_load (MonoArray *types, MonoArray *exceptions);
 
+G_END_DECLS
+
 #endif /* _MONO_METADATA_EXCEPTION_H_ */

diff --git a/mono/metadata/file-io.h b/mono/metadata/file-io.h
index b3f8b9f48f5455a159edebc29a148525ce1f1224..58cb61c2b2f0092c6fb35868a567d8a48931d6f4 100644 (file)
--- a/mono/metadata/file-io.h
+++ b/mono/metadata/file-io.h
@@ -17,6 +17,8 @@
 #include <mono/metadata/object-internals.h>
 #include <mono/io-layer/io-layer.h>
 
+G_BEGIN_DECLS
+
 /* This is a copy of System.IO.FileAccess */
 typedef enum {
        FileAccess_Read=0x01,
@@ -219,4 +221,6 @@ extern void ves_icall_System_IO_MonoIO_Lock (HANDLE handle, gint64 position,
 extern void ves_icall_System_IO_MonoIO_Unlock (HANDLE handle, gint64 position,
                                               gint64 length, gint32 *error);
 
+G_END_DECLS
+
 #endif /* _MONO_METADATA_FILEIO_H_ */

diff --git a/mono/metadata/image.h b/mono/metadata/image.h
index c10cc85def563d315dd2f643841d3754ac5002f2..16766889b4bba56c987518edfd2f708ebeb2f107 100644 (file)
--- a/mono/metadata/image.h
+++ b/mono/metadata/image.h
@@ -5,6 +5,8 @@
 #include <glib.h>
 #include <gmodule.h>
 
+G_BEGIN_DECLS
+
 typedef struct _MonoImage MonoImage;
 typedef struct _MonoAssembly MonoAssembly;
 typedef struct _MonoTableInfo MonoTableInfo;
@@ -79,5 +81,6 @@ void          mono_image_add_to_name_cache (MonoImage *image,
                                                                                        const char *name, guint32 idx);
 gboolean      mono_image_has_authenticode_entry (MonoImage *image);
 
+G_END_DECLS
 
 #endif

diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h
index c79e75577ae268feaad599660b88dfef1002fd95..d894e9bdac8886bdbca2ac24ee57934d02dd2053 100644 (file)
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@@ -4,6 +4,8 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/image.h>
 
+G_BEGIN_DECLS
+
 typedef struct _MonoMethod MonoMethod;
 
 typedef gboolean (*MonoStackWalk)     (MonoMethod *method, gint32 native_offset, gint32 il_offset, gboolean managed, gpointer data);
@@ -84,5 +86,7 @@ mono_stack_walk         (MonoStackWalk func, gpointer user_data);
 void
 mono_stack_walk_no_il   (MonoStackWalk func, gpointer user_data);
 
+G_END_DECLS
+
 #endif
 

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index 26c807884691b7d64288302e20350c646a9502f6..cedb32c3512784051a466f369076c1ca3ebba60e 100644 (file)
--- a/mono/metadata/marshal.h
+++ b/mono/metadata/marshal.h
@@ -18,6 +18,8 @@
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/reflection.h>
 
+G_BEGIN_DECLS
+
 typedef struct _MonoMethodBuilder MonoMethodBuilder;
 
 /* marshaling helper functions */
@@ -345,5 +347,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_UnsafeAddrOfPinnedArrayElement
 MonoDelegate*
 ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type);
 
+G_END_DECLS
+
 #endif /* __MONO_MARSHAL_H__ */
 

diff --git a/mono/metadata/mempool.h b/mono/metadata/mempool.h
index 20eb5f3163801d6987f43ae5b41f4dd980a991f1..8be89d98f81da43bb3db853084f3284f7310b313 100644 (file)
--- a/mono/metadata/mempool.h
+++ b/mono/metadata/mempool.h
@@ -1,6 +1,8 @@
 #ifndef _MONO_MEMPOOL_H_
 #define _MONO_MEMPOOL_H_
 
+G_BEGIN_DECLS
+
 typedef struct _MonoMemPool MonoMemPool;
 
 MonoMemPool *
@@ -28,6 +30,8 @@ mono_mempool_alloc0        (MonoMemPool *pool,
 
 gboolean
 mono_mempool_contains_addr (MonoMemPool *pool,
-                                                       gpointer addr);
+                           gpointer addr);
+
+G_END_DECLS
 
 #endif

diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h
index d71c9f82ffabbacbc3e915fb9ca3662e84214f6f..0c8511e28a452044ce2f4b9b4d7a7becd6bee061 100644 (file)
--- a/mono/metadata/metadata.h
+++ b/mono/metadata/metadata.h
@@ -8,6 +8,8 @@
 #include <mono/metadata/row-indexes.h>
 #include <mono/metadata/image.h>
 
+G_BEGIN_DECLS
+
 #ifdef __GNUC__
 #define MONO_ZERO_LEN_ARRAY 0
 #else
@@ -435,4 +437,6 @@ char *mono_guid_to_string (const guint8 *guid);
 
 guint32 mono_metadata_declsec_from_index (MonoImage *meta, guint32 idx);
 
+G_END_DECLS
+
 #endif /* __MONO_METADATA_H__ */

diff --git a/mono/metadata/monitor.h b/mono/metadata/monitor.h
index f89b0acf007630cd09e002b2f2040be5420be9a8..26aeb582b7c6e2846b008e262d73f0fd34756182 100644 (file)
--- a/mono/metadata/monitor.h
+++ b/mono/metadata/monitor.h
@@ -11,9 +11,10 @@
 #define _MONO_METADATA_MONITOR_H_
 
 #include <glib.h>
-
 #include <mono/metadata/object.h>
 
+G_BEGIN_DECLS
+
 void mono_monitor_init (void);
 
 extern gboolean ves_icall_System_Threading_Monitor_Monitor_try_enter(MonoObject *obj, guint32 ms);
@@ -24,4 +25,6 @@ extern void ves_icall_System_Threading_Monitor_Monitor_pulse(MonoObject *obj);
 extern void ves_icall_System_Threading_Monitor_Monitor_pulse_all(MonoObject *obj);
 extern gboolean ves_icall_System_Threading_Monitor_Monitor_wait(MonoObject *obj, guint32 ms);
 
+G_END_DECLS
+
 #endif /* _MONO_METADATA_MONITOR_H_ */

diff --git a/mono/metadata/mono-gc.h b/mono/metadata/mono-gc.h
index a76aea5bfb7ebbcc92d5cd11a5e4a4b3e808944e..61f2d61a8bc985a4782fe80e69b0bb9a1632783e 100644 (file)
--- a/mono/metadata/mono-gc.h
+++ b/mono/metadata/mono-gc.h
@@ -7,10 +7,14 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 void   mono_gc_collect         (int generation);
 int    mono_gc_max_generation  (void);
 gint64 mono_gc_get_used_size   (void);
 gint64 mono_gc_get_heap_size   (void);
 
+G_END_DECLS
+
 #endif /* __METADATA_MONO_GC_H__ */
 

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index c36f8ee1a6ae437d7095304d07a3ffc21411153d..2ebbd41c0721c1a4fdb649e1a6040d2175bbf282 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -3,6 +3,8 @@
 
 #include <mono/metadata/class.h>
 
+G_BEGIN_DECLS
+
 typedef guchar MonoBoolean;
 
 typedef struct _MonoReflectionMethod MonoReflectionMethod;
@@ -279,5 +281,7 @@ guint32      mono_gchandle_new_weakref (MonoObject *obj, gboolean track_resurrec
 MonoObject*  mono_gchandle_get_target  (guint32 gchandle);
 void         mono_gchandle_free        (guint32 gchandle);
 
+G_END_DECLS
+
 #endif
 

diff --git a/mono/metadata/opcodes.h b/mono/metadata/opcodes.h
index 60c6a53e036d605576c64753dfb4a34da920756f..7aa31a3427e8775c12fa3877d6d7263eb03b216d 100644 (file)
--- a/mono/metadata/opcodes.h
+++ b/mono/metadata/opcodes.h
@@ -12,6 +12,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define MONO_CUSTOM_PREFIX 0xf0
 
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) \
@@ -68,4 +70,6 @@ mono_opcode_name (int opcode);
 MonoOpcodeEnum
 mono_opcode_value (const guint8 **ip, const guint8 *end);
 
+G_END_DECLS
+
 #endif /* __MONO_METADATA_OPCODES_H__ */

diff --git a/mono/metadata/profiler.h b/mono/metadata/profiler.h
index e8b9008d92c843f3b29622fb0c52dee51df83335..6ca895dc125a2c339652dfd13a29b2cde61df6c5 100644 (file)
--- a/mono/metadata/profiler.h
+++ b/mono/metadata/profiler.h
@@ -4,6 +4,8 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
        MONO_PROFILE_NONE = 0,
        MONO_PROFILE_APPDOMAIN_EVENTS = 1 << 0,
@@ -50,6 +52,7 @@ typedef struct {
 
 typedef struct _MonoProfiler MonoProfiler;
 
+
 /*
  * Functions that the runtime will call on the profiler.
  */
@@ -109,5 +112,7 @@ void mono_profiler_install_gc    (MonoProfileGCFunc callback, MonoProfileGCResiz
 
 void mono_profiler_load             (const char *desc);
 
+G_END_DECLS
+
 #endif /* __MONO_PROFILER_H__ */
 

diff --git a/mono/metadata/reflection.h b/mono/metadata/reflection.h
index e653f6e604a86cb46b204a6ee87ea0ee6fcd72f6..884fdd978652ae9fd9ef1ca93757558feed2c6b3 100644 (file)
--- a/mono/metadata/reflection.h
+++ b/mono/metadata/reflection.h
@@ -3,6 +3,8 @@
 
 #include <mono/metadata/object.h>
 
+G_BEGIN_DECLS
+
 typedef struct MonoTypeNameParse MonoTypeNameParse;
 
 struct MonoTypeNameParse {
@@ -134,4 +136,6 @@ MonoBoolean mono_declsec_get_method_action (MonoMethod *method, guint32 action,
 MonoBoolean mono_declsec_get_class_action (MonoClass *klass, guint32 action, MonoDeclSecurityEntry *entry);
 MonoBoolean mono_declsec_get_assembly_action (MonoAssembly *assembly, guint32 action, MonoDeclSecurityEntry *entry);
 
+G_END_DECLS
+
 #endif /* __METADATA_REFLECTION_H__ */

diff --git a/mono/metadata/security.h b/mono/metadata/security.h
index d8688e136b36636b0612ca0da6133a9b1722ac7a..b5ef4cf0ea7673a10dd33dfe5471b22c7609619a 100644 (file)
--- a/mono/metadata/security.h
+++ b/mono/metadata/security.h
@@ -13,6 +13,7 @@
 
 #include <mono/metadata/object.h>
 
+G_BEGIN_DECLS
 
 /* System.Environment */
 extern MonoString* ves_icall_System_Environment_get_UserName (void);
@@ -48,5 +49,6 @@ extern MonoBoolean ves_icall_Mono_Security_Cryptography_KeyPairPersistence_Prote
 /* System.Security.Policy.Evidence */
 MonoBoolean ves_icall_System_Security_Policy_Evidence_IsAuthenticodePresent (MonoReflectionAssembly *refass);
 
+G_END_DECLS
 
 #endif /* _MONO_METADATA_SECURITY_H_ */

diff --git a/mono/metadata/threads.h b/mono/metadata/threads.h
index 13de557cd684b2df821f1cb5338f52649f263540..905bd9495f5b6ffe4198e6a404704f36488cb405 100644 (file)
--- a/mono/metadata/threads.h
+++ b/mono/metadata/threads.h
@@ -14,6 +14,8 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 
+G_BEGIN_DECLS
+
 typedef void (*MonoThreadCleanupFunc) (MonoThread* thread);
 
 extern int  mono_thread_get_abort_signal (void);
@@ -73,4 +75,6 @@ extern void mono_thread_interruption_checkpoint (void);
 extern void mono_thread_force_interruption_checkpoint (void);
 extern gint32* mono_thread_interruption_request_flag (void);
 
+G_END_DECLS
+
 #endif /* _MONO_METADATA_THREADS_H_ */

diff --git a/mono/metadata/verify.h b/mono/metadata/verify.h
index b15c501f49a04479519d0f4f3a3b95fce0bd10ef..a4a38d94701dacbc50b0a5fe2109d7fe7bbe555c 100644 (file)
--- a/mono/metadata/verify.h
+++ b/mono/metadata/verify.h
@@ -5,6 +5,8 @@
 #include <mono/metadata/image.h>
 #include <mono/metadata/loader.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
        MONO_VERIFY_OK,
        MONO_VERIFY_ERROR,
@@ -23,5 +25,7 @@ GSList* mono_method_verify       (MonoMethod *method, int level);
 void    mono_free_verify_list    (GSList *list);
 char*   mono_verify_corlib       (void);
 
+G_END_DECLS
+
 #endif  /* __MONO_METADATA_VERIFY_H__ */
 

diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
index e06de0e67b9c7595199c1e1c752207f3a67a83fb..7c6c1159c58ca489b12afee177efafc289d77282 100644 (file)
--- a/mono/utils/ChangeLog
+++ b/mono/utils/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Duncan Mak  <duncan@novell.com>
+
+       * *.h: Added G_BEGIN_DECLS and G_END_DECLS where appropriate to
+       all public headers. Fixes #74919.
+
 2005-05-18  Zoltan Varga  <vargaz@freemail.hu>
 
        * mono-codeman.c: Align code on a 16 byte boundary on ia64.

diff --git a/mono/utils/mono-codeman.h b/mono/utils/mono-codeman.h
index a35cbd83d80f4f098004e2a0c184d4a167671c1c..b6ef439be248b5117c5ef773ee4cac79532e03fe 100644 (file)
--- a/mono/utils/mono-codeman.h
+++ b/mono/utils/mono-codeman.h
@@ -15,6 +15,5 @@ void             mono_code_manager_commit  (MonoCodeManager *cman, void *data, i
 typedef int    (*MonoCodeManagerFunc)      (void *data, int csize, int size, void *user_data);
 void            mono_code_manager_foreach  (MonoCodeManager *cman, MonoCodeManagerFunc func, void *user_data);
 
-
 #endif /* __MONO_CODEMAN_H__ */
 

diff --git a/mono/utils/mono-digest.h b/mono/utils/mono-digest.h
index fd0222c1f8749028417a62bd783d0100e0675d8a..a605356c8147ad38009408f707e00e7217695882 100644 (file)
--- a/mono/utils/mono-digest.h
+++ b/mono/utils/mono-digest.h
@@ -28,6 +28,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct {
        guint32 buf[4];
        guint32 bits[2];
@@ -61,4 +63,5 @@ void mono_sha1_final  (MonoSHA1Context* context, unsigned char digest[20]);
 
 void mono_digest_get_public_token (guchar* token, const guchar *pubkey, guint32 len);
 
+G_END_DECLS
 #endif /* __MONO_DIGEST_H__ */

diff --git a/mono/utils/mono-logger.h b/mono/utils/mono-logger.h
index b7440adb8cc7c9e289324fba7a1af51fb77b01e6..6cb56d27b91c5792548b672b4d20435a80091b34 100644 (file)
--- a/mono/utils/mono-logger.h
+++ b/mono/utils/mono-logger.h
@@ -3,6 +3,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
        MONO_TRACE_ASSEMBLY             = (1<<0),
        MONO_TRACE_TYPE                 = (1<<1),
@@ -90,6 +92,8 @@ mono_trace_message(MonoTraceMask mask, const char *format, ...)
        va_end (args);
 }
 
+G_END_DECLS
+
 #endif /* !__GNUC__ */
 
 #endif /* __MONO_LOGGER_H__ */