2006-10-09 Miguel de Icaza <miguel@novell.com>

	* src/gmodule.h: Move definitions of gmodule to gmodule.h because
	Mono expects it there.

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

diff --git a/eglib/ChangeLog b/eglib/ChangeLog
index adfc3a99a59ab6fceea38490f58fed1c11a9cfe0..8f46f2fbf2378c0c3c2dc15a43b67f63e8584e42 100644 (file)
--- a/eglib/ChangeLog
+++ b/eglib/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-09  Miguel de Icaza  <miguel@novell.com>
+
+       * src/gmodule.h: Move definitions of gmodule to gmodule.h because
+       Mono expects it there.
 
 Mon Oct 9 12:59:16 CEST 2006 Paolo Molaro <lupus@ximian.com>
 

diff --git a/eglib/src/garray.c b/eglib/src/garray.c
index bdaaaf8920bcb2d3bb36917924bab7721e8cae1e..70b5bf0a54ed45b9fe924a9dc70ac7de1977d0bb 100644 (file)
--- a/eglib/src/garray.c
+++ b/eglib/src/garray.c
@@ -36,11 +36,11 @@
 #define element_length(p,i) ((i) * (p)->element_size)
 
 typedef struct {
-  GArray array;
-  gboolean clear_;
-  gboolean element_size;
-  gboolean zero_terminated;
-  gint capacity;
+       GArray array;
+       gboolean clear_;
+       gboolean element_size;
+       gboolean zero_terminated;
+       gint capacity;
 } GArrayPriv;
 
 static void

diff --git a/eglib/src/glib.h b/eglib/src/glib.h
index 8f19fdb8c10a5bb7899f9d5ec310fc3ab4cdac53..12741f4aeb037b3715b6f4f427e0ea92139421e2 100644 (file)
--- a/eglib/src/glib.h
+++ b/eglib/src/glib.h
@@ -674,23 +674,6 @@ gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
 gboolean         g_markup_parse_context_end_parse (GMarkupParseContext *context,
                                                   GError **error);
 
-/*
- * GModule support
- */
-
-typedef struct _GModule GModule;
-
-typedef enum {
-       G_MODULE_BIND_LAZY = 1,
-       G_MODULE_BIND_LOCAL = 2,
-       G_MODULE_BIND_MASK = 3
-} GModuleFlags;
-
-GModule     *g_module_open (const gchar *file, GModuleFlags flags);
-gboolean     g_module_symbol (GModule *module, const gchar *symbol_name, gpointer *symbol);
-const gchar *g_module_error (void);
-gboolean     g_module_close (GModule *module);
-
 /*
  * Character set conversion
  */

diff --git a/eglib/src/gmodule.c b/eglib/src/gmodule.c
index 3e4ba580a3379c0bd3eb5e53a2653364159a3bf5..ebd45a7e696311616f4d0ffac7856d6bd40647f9 100644 (file)
--- a/eglib/src/gmodule.c
+++ b/eglib/src/gmodule.c
@@ -28,6 +28,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <glib.h>
+#include <gmodule.h>
 
 #ifdef G_OS_UNIX
 #include <dlfcn.h>