diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-03-09 21:33:23 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-03-09 21:33:23 +0000 |
| commit | 8dd860987015d6be46bccab82ba00f03140f0396 (patch) | |
| tree | 30d2299a35f948d8102364bb743742892e6e8309 /gmodule/gmodule.h | |
| parent | 754d8ddad85ef7054bf262bbc57ee67a0278f493 (diff) | |
Use G_BEGIN_DECLS and G_END_DECLS. Define G_MODULE_EXPORT correctly on
2001-02-21 Tor Lillqvist <tml@iki.fi>
* gmodule.h: Use G_BEGIN_DECLS and G_END_DECLS. Define
G_MODULE_EXPORT correctly on Cygwin, too.
* gmodule-win32.c (_g_module_open): Convert path to Windows format
on Cygwin.
* Makefile.am (libglib): Use libglib-1.3.la from
top_builddir. Invoke libtool with -no-undefined for Win32 and
Cygwin.
Diffstat (limited to 'gmodule/gmodule.h')
| -rw-r--r-- | gmodule/gmodule.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 39d00d71b..2c335aba3 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -29,19 +29,17 @@ #include <glib.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* exporting and importing functions, this is special cased * to feature Windows dll stubs. */ #define G_MODULE_IMPORT extern -#if defined (G_OS_WIN32) +#ifdef G_PLATFORM_WIN32 # define G_MODULE_EXPORT __declspec(dllexport) -#else /* !G_OS_WIN32 */ +#else /* !G_PLATFORM_WIN32 */ # define G_MODULE_EXPORT -#endif /* !G_OS_WIN32 */ +#endif /* !G_PLATFORM_WIN32 */ typedef enum { @@ -92,9 +90,6 @@ gchar* g_module_build_path (const gchar *directory, const gchar *module_name); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GMODULE_H__ */ |