Commit 7359af94 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Don't define WIN32 and NATIVE_WIN32.

1999-10-05  Tor Lillqvist  <tml@iki.fi>

* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.

* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.

* build-dll: Don't strip.

* gmodule.h: (Win32) Use __declspec(dllexport) in G_MODULE_EXPORT
only with gcc.
parent 65ef92ce
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
* build-dll: Don't strip.
Sun Oct 3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
......
......@@ -29,9 +29,9 @@ for F in $ldargs; do
esac
done
$GCC -s -mdll -mno-cygwin -Wl,--base-file,$library.base -o $dllfile $ldargs &&
$GCC -mdll -mno-cygwin -Wl,--base-file,$library.base -o $dllfile $ldargs &&
$DLLTOOL --as=$AS --dllname $dllfile $defswitch --base-file $library.base --output-exp $library.exp $objs &&
$GCC -s -mdll -mno-cygwin -Wl,--base-file,$library.base,$library.exp -o $dllfile $ldargs &&
$GCC -mdll -mno-cygwin -Wl,--base-file,$library.base,$library.exp -o $dllfile $ldargs &&
$DLLTOOL --as=$AS --dllname $dllfile $defswitch --base-file $library.base --output-exp $library.exp $objs &&
$GCC -mdll -mno-cygwin -Wl,$library.exp -o $dllfile $ldargs &&
$DLLTOOL --as=$AS --dllname $dllfile $defswitch --output-lib lib$libname.a $objs
......
......@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
if (!prg_name)
prg_name = g_get_prgname ();
MessageBox (NULL, "Terminating",
MessageBox (NULL, "g_on_error_query called, program terminating",
(prg_name && *prg_name) ? prg_name : NULL,
MB_OK|MB_ICONERROR);
_exit(0);
......
......@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
if (!prg_name)
prg_name = g_get_prgname ();
MessageBox (NULL, "Terminating",
MessageBox (NULL, "g_on_error_query called, program terminating",
(prg_name && *prg_name) ? prg_name : NULL,
MB_OK|MB_ICONERROR);
_exit(0);
......
......@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
if (!prg_name)
prg_name = g_get_prgname ();
MessageBox (NULL, "Terminating",
MessageBox (NULL, "g_on_error_query called, program terminating",
(prg_name && *prg_name) ? prg_name : NULL,
MB_OK|MB_ICONERROR);
_exit(0);
......
......@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
if (!prg_name)
prg_name = g_get_prgname ();
MessageBox (NULL, "Terminating",
MessageBox (NULL, "g_on_error_query called, program terminating",
(prg_name && *prg_name) ? prg_name : NULL,
MB_OK|MB_ICONERROR);
_exit(0);
......
......@@ -185,12 +185,6 @@ struct _GStaticMutex
#define G_HAVE_WCHAR_H 1
#define G_HAVE_WCTYPE_H 1
/* Define if this is Win32, possibly using the Cygwin emulation layer. */
#define WIN32 1
/* Define if this is Win32 using the Microsoft C runtime. */
#define NATIVE_WIN32 1
#ifdef __cplusplus
}
#endif /* __cplusplus */
......
1999-10-05 Tor Lillqvist <tml@iki.fi>
* gmodule.h: (Win32) Use __declspec(dllexport) in G_MODULE_EXPORT
only with gcc.
Sun Oct 3 19:30:52 PDT 1999 Manish Singh <yosh@gimp.org>
* gmodule.h
......
......@@ -40,7 +40,7 @@ extern const char *g_log_domain_gmodule;
* to feature Windows dll stubs.
*/
#define G_MODULE_IMPORT extern
#ifdef G_OS_WIN32
#if defined (G_OS_WIN32) && defined (__GNUC__)
# define G_MODULE_EXPORT __declspec(dllexport)
#else /* !G_OS_WIN32 */
# define G_MODULE_EXPORT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment