diff options
| author | Manish Singh <yosh@src.gnome.org> | 1999-10-04 02:32:50 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 1999-10-04 02:32:50 +0000 |
| commit | 7ea73a019935e1118935433c86480acc5eee2e05 (patch) | |
| tree | b7afcc4761a189dcea1ce0f405f2a585e624f30c /gmodule | |
| parent | 4944d4df46e31275173c5d559792d21b5839a5cd (diff) | |
G_OS_FOO #defines. I *think* I got the cygwin and beos stuff right, but
I haven't tested it. The respective porters should fix any screwups
-Yosh
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 5 | ||||
| -rw-r--r-- | gmodule/gmodule.h | 6 | ||||
| -rw-r--r-- | gmodule/testgmodule.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 7a4232668..003914627 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 3 19:30:52 PDT 1999 Manish Singh <yosh@gimp.org> + + * gmodule.h + * testgmodule.c: use G_OS stuff + Sat Jul 24 20:47:18 1999 Tim Janik <timj@gtk.org> * merged changes from GLib-1-2 branch. diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 908575c13..f4914013a 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -40,11 +40,11 @@ extern const char *g_log_domain_gmodule; * to feature Windows dll stubs. */ #define G_MODULE_IMPORT extern -#ifdef NATIVE_WIN32 +#ifdef G_OS_WIN32 # define G_MODULE_EXPORT __declspec(dllexport) -#else /* !NATIVE_WIN32 */ +#else /* !G_OS_WIN32 */ # define G_MODULE_EXPORT -#endif /* !NATIVE_WIN32 */ +#endif /* !G_OS_WIN32 */ typedef enum { diff --git a/gmodule/testgmodule.c b/gmodule/testgmodule.c index cb40da129..42c28e6ed 100644 --- a/gmodule/testgmodule.c +++ b/gmodule/testgmodule.c @@ -52,13 +52,13 @@ main (int arg, string = g_get_current_dir (); g_print ("testgmodule (%s):\n", string); -#ifdef NATIVE_WIN32 +#ifdef G_OS_WIN32 plugin_a = g_strconcat (string, "\\libgplugin_a.dll", NULL); plugin_b = g_strconcat (string, "\\libgplugin_b.dll", NULL); -#else /* !NATIVE_WIN32 */ +#else /* !G_OS_WIN32 */ plugin_a = g_strconcat (string, "/.libs/", "libgplugin_a.so", NULL); plugin_b = g_strconcat (string, "/.libs/", "libgplugin_b.so", NULL); -#endif /* NATIVE_WIN32 */ +#endif /* G_OS_WIN32 */ g_free (string); /* module handles |