diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-09-26 20:35:51 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-09-26 20:35:51 +0000 |
| commit | 18190575f89557490fb3a971a1b72052135e74c4 (patch) | |
| tree | 630331bb709ffa71126022e6d72599eb6f4684c1 /glibconfig.h.win32.in | |
| parent | 861fb083f291ff897cf18a280bec889b2b969053 (diff) | |
| download | glib-18190575f89557490fb3a971a1b72052135e74c4.tar.gz glib-18190575f89557490fb3a971a1b72052135e74c4.tar.bz2 glib-18190575f89557490fb3a971a1b72052135e74c4.zip | |
Retract my change earlier today. Don't preset autoconf variables in a try
2001-09-26 Tor Lillqvist <tml@iki.fi>
* configure.in: Retract my change earlier today. Don't preset
autoconf variables in a try to match both mingw and MSVC. Instead,
he who packages a prebuilt GLib developer distribution for Win32
runs configure twice: once for mingw, once for MSVC, and then uses
diff -D on the glibconfig.h files to generate a suitably ifdeffed
glibconfig.h for distribution that suits both compilers. (Ditto
for config.h, although that file wouldn't be distributed in a
developer package, but in a source package for Win32 users who
want to build GLib but can't use configure.)
* glibconfig.h.win32.in
* config.h.win32.in: Generated by using diff -D as described above.
* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
library.
gthread:
2001-09-26 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Fix couple of typos.
* gthread.def: Add g_thread_init_with_errorcheck_mutexes.
Diffstat (limited to 'glibconfig.h.win32.in')
| -rw-r--r-- | glibconfig.h.win32.in | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 22e25814f..099a1fe32 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -1,6 +1,6 @@ -/* glibconfig.h.win32 +/* glibconfig.h * - * This is a based on a generated file. Please modify 'configure.in' + * This is a generated file. Please modify 'configure.in' */ #ifndef __G_LIBCONFIG_H__ @@ -39,15 +39,19 @@ typedef unsigned int guint32; #define G_GUINT32_FORMAT "u" #define G_HAVE_GINT64 1 -#ifdef _MSC_VER -typedef __int64 gint64; +#ifndef _MSC_VER +G_GNUC_EXTENSION typedef signed long long gint64; +G_GNUC_EXTENSION typedef unsigned long long guint64; +#else /* _MSC_VER */ +typedef signed __int64 gint64; typedef unsigned __int64 guint64; +#endif /* _MSC_VER */ + +#ifndef _MSC_VER +#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) +#else /* _MSC_VER */ #define G_GINT64_CONSTANT(val) (val##i64) -#elif __GNUC__ -typedef long long gint64; -typedef unsigned long long guint64; -#define G_GINT64_CONSTANT(val) (val##LL) -#endif +#endif /* _MSC_VER */ #define G_GINT64_FORMAT "I64i" #define G_GUINT64_FORMAT "I64u" @@ -83,17 +87,24 @@ typedef guint32 gsize; #ifdef __cplusplus #define G_HAVE_INLINE 1 #else /* !__cplusplus */ +#ifndef _MSC_VER +#define G_HAVE_INLINE 1 +#else /* _MSC_VER */ +#endif /* _MSC_VER */ #define G_HAVE___INLINE 1 +#ifndef _MSC_VER +#define G_HAVE___INLINE__ 1 +#endif /* not _MSC_VER */ #endif /* !__cplusplus */ +#ifndef _MSC_VER #ifndef __cplusplus # define G_HAVE_ISO_VARARGS 1 #endif -#ifdef __GNUC__ #define G_HAVE_GNUC_VARARGS 1 -#endif +#endif /* not _MSC_VER */ #define G_THREADS_ENABLED |