diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-04-25 21:55:05 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-04-25 21:55:05 +0000 |
| commit | 1c84483f3ee8559179b49a200d3cc6854e81b873 (patch) | |
| tree | 5cf6ca83caba4ca5939841987f95262cac4b5fa7 /config.h.win32 | |
| parent | eedec945df8925c97e924692b08487a292c01580 (diff) | |
| download | gtk+-1c84483f3ee8559179b49a200d3cc6854e81b873.tar.gz | |
Support added for building using a GNU toolchain on Win32,
gcc -mno-cygwin (egcs-1.1.2) on cygwin-b20.1.
* gdk/win32/makefile.cygwin gtk/makefile.cygwin: New files.
* config.h.win32: Changes for gcc.
* gdk/gdkrectangle.c: Include gdk.h as <gdk/gdk.h>.
* gdk/gdkcolor.c: config.h.win32 already defines strcasecmp.
* gdk/win32/gdkconfig.h: Only the MS compiler has wctype.h.
* gdk/win32/gdkdnd.c: Protect (unused) OLE2 stuff better.
Protect shl stuff unavaiilable with mingw32 headers.
* gdk/win32/gdkevents.c: Fix typo.
* gdk/win32/gdkglobals.c: Use GDKVAR here also for gcc.
* gdk/win32/gdkim.c: Use OEM code page for multibyte chars. (?)
* gdk/win32/gdkinput.c: Use __try __except only with the MS compiler.
* gdk/win32/gdkprivate.h: Make up for some stuff missing from
the mingw32 headers.
* gdk/win32/makefile.msc: Use latest Wintab kit and glib.
* gtk/gtkfilesel.c: Include <glib.h> early, to get stat->_stat
definition on Win32. Test for NATIVE_WIN32, not _MSC_VER.
* gtk/gtkfontsel.c: Protect CHARSET redefinition on Win32.
Test for NATIVE_WIN32, not _MSC_VER.
* gtk/gtkmain.c: No use warning about developer version on Win32,
there aren't any non-developer versions anyhow.
* gtk/gtkrc.c: Test for NATIVE_WIN32, not _MSC_VER.
* gtk/makefile.msc: Use pthread from another directory. Minor other
changes.
Diffstat (limited to 'config.h.win32')
| -rwxr-xr-x | config.h.win32 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config.h.win32 b/config.h.win32 index 77a8137bd0..6bfa081383 100755 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,6 +1,6 @@ /* config.h.win32. Handcrafted for Microsoft C */ -#ifndef _MSC_VER +#if ! (defined(_MSC_VER) || defined(__GNUC__)) #error Unrecognized Win32 compiler, edit config.h.win32 by hand #endif @@ -16,7 +16,11 @@ /* Define if you have alloca, as a function or macro. */ #define HAVE_ALLOCA 1 +#ifdef _MSC_VER #define alloca _alloca +#elif defined (__GNUC__) +#define alloca __builtin_alloca +#endif /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ /* #undef HAVE_ALLOCA_H */ @@ -121,7 +125,7 @@ /* Define if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 -#define strcasecmp stricmp +#define strcasecmp _stricmp /* Define if you have the strchr function. */ #define HAVE_STRCHR 1 @@ -166,7 +170,9 @@ #define HAVE_WCHAR_H 1 /* Define if you have the <wctype.h> header file. */ +#ifdef _MSC_VER #define HAVE_WCTYPE_H 1 +#endif /* _MSC_VER */ /* Define if you have the i library (-li). */ /* #undef HAVE_LIBI */ |