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
This commit is contained in:
Manish Singh
1999-10-04 02:32:50 +00:00
parent 4944d4df46
commit 7ea73a0199
37 changed files with 344 additions and 206 deletions

View File

@@ -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.

View File

@@ -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
{

View File

@@ -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