2010-07-02 Michael Hutchinson <mhutchinson@novell.com>

	* Makefile.am: Add mono-error.h to public headers.
	* mono-error.h: Use public version of API.

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

diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
index 876d0207d99f2035af6a658bfa9ee32c8386676c..4fdf3174b8db1b42586ab130f81368ebc300a4a0 100644 (file)
--- a/mono/utils/ChangeLog
+++ b/mono/utils/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-02  Michael Hutchinson  <mhutchinson@novell.com>
+
+       * Makefile.am: Add mono-error.h to public headers.
+       * mono-error.h: Use public version of API.
 
 Wed Jun 30 12:06:33 CEST 2010 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 97950bec022c6897b4443fddb0f8f75e8ae9e1b2..72e86e420f9a681367ec870f70c43c532e62c518 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -99,6 +99,7 @@ libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils
 
 libmonoutilsinclude_HEADERS = \
        mono-logger.h   \
+       mono-error.h    \
        mono-publib.h
 
 EXTRA_DIST = ChangeLog

diff --git a/mono/utils/mono-error.h b/mono/utils/mono-error.h
index 6f722cff980bede42657a4e3a9b792f2e55e45ec..b7d6029103941a5c2ebfb6201ee1c0efa9f93bbd 100644 (file)
--- a/mono/utils/mono-error.h
+++ b/mono/utils/mono-error.h
@@ -1,6 +1,8 @@
 #ifndef __MONO_ERROR_H__
 #define __MONO_ERROR_H__
 
+#include <mono/utils/mono-publib.h>
+
 enum {
        /*
        The supplied strings were dup'd by means of calling mono_error_dup_strings.
@@ -39,7 +41,7 @@ typedef struct {
     char hidden_2 [128]; /*DON'T TOUCH */
 } MonoError;
 
-G_BEGIN_DECLS
+MONO_BEGIN_DECLS
 
 void
 mono_error_init (MonoError *error);
@@ -50,7 +52,7 @@ mono_error_init_flags (MonoError *error, unsigned short flags);
 void
 mono_error_cleanup (MonoError *error);
 
-gboolean
+mono_bool
 mono_error_ok (MonoError *error);
 
 unsigned short
@@ -59,5 +61,6 @@ mono_error_get_error_code (MonoError *error);
 const char*
 mono_error_get_message (MonoError *error);
 
-G_END_DECLS
+MONO_END_DECLS
+
 #endif