G_OS_FOO #defines. I *think* I got the cygwin and beos stuff right, but

[platform/upstream/glib.git] / gmodule / gmodule.h

diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index 21788e3..f491401 100644 (file)
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -16,25 +16,35 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GLib Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #ifndef __GMODULE_H__
 #define __GMODULE_H__
 
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif /* __cplusplus */
 
 extern const char      *g_log_domain_gmodule;
 #include <glib.h>
 
 
-/* exporting and importing functions,
- * we need autoconf support here to feature Windows dll stubs.
+/* exporting and importing functions, this is special cased
+ * to feature Windows dll stubs.
  */
 #define        G_MODULE_IMPORT         extern
-#define        G_MODULE_EXPORT
-
+#ifdef G_OS_WIN32
+#  define      G_MODULE_EXPORT         __declspec(dllexport)
+#else /* !G_OS_WIN32 */
+#  define      G_MODULE_EXPORT
+#endif /* !G_OS_WIN32 */
 
 typedef enum
 {
@@ -44,7 +54,7 @@ typedef enum
 
 typedef        struct _GModule                  GModule;
 typedef const gchar* (*GModuleCheckInit) (GModule      *module);
-typedef void        (*GModuleDeInit)    (GModule       *module);
+typedef void        (*GModuleUnload)    (GModule       *module);
 
 /* return TRUE if dynamic module loading is supported */
 gboolean       g_module_supported         (void);
@@ -56,6 +66,9 @@ GModule*      g_module_open              (const gchar         *file_name,
 /* close a previously opened module, returns TRUE on success */
 gboolean       g_module_close             (GModule             *module);
 
+/* make a module resident so g_module_close on it will be ignored */
+void           g_module_make_resident     (GModule             *module);
+
 /* query the last module error as a string */
 gchar*         g_module_error             (void);
 
@@ -68,6 +81,20 @@ gboolean     g_module_symbol            (GModule             *module,
 gchar*         g_module_name              (GModule             *module);
 
 
+/* Build the actual file name containing a module. `directory' is the
+ * directory where the module file is supposed to be, or NULL or empty
+ * in which case it should either be in the current directory or, on
+ * some operating systems, in some standard place, for instance on the
+ * PATH. Hence, to be absoultely sure to get the correct module,
+ * always pass in a directory. The file name consists of the directory,
+ * if supplied, and `module_name' suitably decorated accoring to
+ * the operating system's conventions (for instance lib*.so or *.dll).
+ *
+ * No checks are made that the file exists, or is of correct type.
+ */
+gchar*         g_module_build_path       (const gchar          *directory,
+                                          const gchar          *module_name);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */