diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-03 21:00:49 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-03 21:00:49 +0000 |
| commit | 69ac9451a6dac6513f1325122bdf9664040267c9 (patch) | |
| tree | 14a313a292919b806a3a1e51ee410da615b18407 /config.h.win32 | |
| parent | 74d7c9173109270ce6593f7b6dd6228dea7d47a4 (diff) | |
| download | gtk+-69ac9451a6dac6513f1325122bdf9664040267c9.tar.gz | |
Guard definition of alloca(). glib.h now handles that.
2000-10-03 Tor Lillqvist <tml@iki.fi>
* config.h.win32: Guard definition of alloca(). glib.h now handles
that.
* gdk/gdk.def
* gtk/gtk.def: Add new entry points.
Changes just to make GTK+ build without errors on Win32. No hope
of it working in its current state, though...:
* gdk/win32/gdkselection-win32.c: Remove gcc -Wall warnings. Add
some functions from the X11 backend, just to make GTK+ build.
* gdk/makefile.mingw.in
* gtk/makefile.mingw.in: Use correct gdk_pixbuf version
number. Add new object files.
* gtk/gtkclipboard.c: Include gdkwin32.h on Win32. Use
GetMessageTime to get timestamp (where on X11 uses
gdk_x11_get_server_time()).
Diffstat (limited to 'config.h.win32')
| -rwxr-xr-x | config.h.win32 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config.h.win32 b/config.h.win32 index 015e64ebba..ecbc5b3d5b 100755 --- a/config.h.win32 +++ b/config.h.win32 @@ -16,10 +16,12 @@ /* 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 +#ifndef alloca + #ifdef _MSC_VER + #define alloca _alloca + #elif defined (__GNUC__) + #define alloca __builtin_alloca + #endif #endif /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ |