diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-01-18 19:05:21 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-01-18 19:05:21 +0000 |
| commit | 98a5ddc4c8afcb87b81dbd7f2a688d55f1a011e3 (patch) | |
| tree | 761dcfb5a5c8872f824726240b59233bb50c7624 /glibconfig.h.win32.in | |
| parent | 4651177384e8bae4497e0099582d5cc34a649407 (diff) | |
| download | glib-98a5ddc4c8afcb87b81dbd7f2a688d55f1a011e3.tar.gz | |
config.h.win32.in glib/galloca.h glib/gbacktrace.h glib/gwin32.c
2007-01-17 Tor Lillqvist <tml@novell.com>
* config.h.win32.in
* glib/galloca.h
* glib/gbacktrace.h
* glib/gwin32.c
* glibconfig.h.win32.in
* README.win32: More minor tweaks for Digital Mars
compiler. (#346808, Serhat Sevki Dincer)
svn path=/trunk/; revision=5294
Diffstat (limited to 'glibconfig.h.win32.in')
| -rw-r--r-- | glibconfig.h.win32.in | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 315249ad8..7aaf65517 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -108,26 +108,17 @@ typedef unsigned int gsize; #define G_HAVE_INLINE 1 #endif /* _MSC_VER */ #define G_HAVE___INLINE 1 -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(__DMC__) #define G_HAVE___INLINE__ 1 -#endif /* not _MSC_VER */ +#endif /* !_MSC_VER and !__DMC__ */ #endif /* !__cplusplus */ -#ifdef __cplusplus +#if defined(__cplusplus) || !defined(_MSC_VER) #define G_CAN_INLINE 1 -#else /* !__cplusplus */ -#ifndef _MSC_VER -#define G_CAN_INLINE 1 -#endif #endif #ifndef _MSC_VER -#ifndef __cplusplus -# define G_HAVE_ISO_VARARGS 1 -#endif -#ifdef __cplusplus -# define G_HAVE_ISO_VARARGS 1 -#endif +#define G_HAVE_ISO_VARARGS 1 /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi * is passed ISO vararg support is turned off, and there is no work |