Attachment 'glibconfig_h.diff'
Download 1 diff U3w C:/obs/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h.orig C:/obs/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h
2 --- C:/obs/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h.orig Thu Mar 24 14:30:27 2011
3 +++ C:/obs/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h Sat Feb 19 11:35:44 2011
4 @@ -1,6 +1,11 @@
5 +/* glibconfig.h.win32.in. Originally merged from two versions of
6 + * glibconfig.h, generated by the GLib configure script, for gcc and
7 + * MSVC.
8 + */
9 +
10 /* glibconfig.h
11 *
12 - * This is a generated file. Please modify 'configure.ac'
13 + * This is a generated file. Please modify 'glibconfig.h.win32.in'
14 */
15
16 #ifndef __G_LIBCONFIG_H__
17 @@ -41,15 +46,46 @@
18 #define G_GUINT32_FORMAT "u"
19 #define G_HAVE_GINT64 1 /* deprecated, always true */
20
21 +#ifndef _MSC_VER
22 G_GNUC_EXTENSION typedef signed long long gint64;
23 G_GNUC_EXTENSION typedef unsigned long long guint64;
24 +#else /* _MSC_VER */
25 +typedef signed __int64 gint64;
26 +typedef unsigned __int64 guint64;
27 +#endif /* _MSC_VER */
28
29 +#ifndef _MSC_VER
30 #define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
31 +#else /* _MSC_VER */
32 +#define G_GINT64_CONSTANT(val) (val##i64)
33 +#endif /* _MSC_VER */
34 +#ifndef _MSC_VER
35 #define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
36 +#else /* _MSC_VER */
37 +#define G_GUINT64_CONSTANT(val) (val##Ui64)
38 +#endif /* _MSC_VER */
39 #define G_GINT64_MODIFIER "I64"
40 #define G_GINT64_FORMAT "I64i"
41 #define G_GUINT64_FORMAT "I64u"
42
43 +#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
44 +
45 +#define GLIB_SIZEOF_VOID_P 8
46 +#define GLIB_SIZEOF_LONG 4
47 +#define GLIB_SIZEOF_SIZE_T 8
48 +
49 +typedef signed long long gssize;
50 +typedef unsigned long long gsize;
51 +#define G_GSIZE_MODIFIER "I64"
52 +#define G_GSSIZE_FORMAT "I64d"
53 +#define G_GSIZE_FORMAT "I64u"
54 +
55 +#define G_MAXSIZE G_MAXUINT64
56 +#define G_MINSSIZE G_MININT64
57 +#define G_MAXSSIZE G_MAXINT64
58 +
59 +#else
60 +
61 #define GLIB_SIZEOF_VOID_P 4
62 #define GLIB_SIZEOF_LONG 4
63 #define GLIB_SIZEOF_SIZE_T 4
64 @@ -64,6 +100,8 @@
65 #define G_MINSSIZE G_MININT
66 #define G_MAXSSIZE G_MAXINT
67
68 +#endif
69 +
70 typedef gint64 goffset;
71 #define G_MINOFFSET G_MININT64
72 #define G_MAXOFFSET G_MAXINT64
73 @@ -73,6 +111,8 @@
74 #define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
75
76
77 +#ifndef _WIN64
78 +
79 #define GPOINTER_TO_INT(p) ((gint) (p))
80 #define GPOINTER_TO_UINT(p) ((guint) (p))
81
82 @@ -86,6 +126,28 @@
83 #define G_GINTPTR_FORMAT "i"
84 #define G_GUINTPTR_FORMAT "u"
85
86 +#else
87 +
88 +#define GPOINTER_TO_INT(p) ((gint) (gint64) (p))
89 +#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p))
90 +
91 +#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i))
92 +#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u))
93 +
94 +#ifndef _MSC_VER
95 +typedef signed long long gintptr;
96 +typedef unsigned long long guintptr;
97 +#else
98 +typedef signed __int64 gintptr;
99 +typedef unsigned __int64 guintptr;
100 +#endif
101 +
102 +#define G_GINTPTR_MODIFIER "I64"
103 +#define G_GINTPTR_FORMAT "I64i"
104 +#define G_GUINTPTR_FORMAT "I64u"
105 +
106 +#endif
107 +
108 #ifdef NeXT /* @#%@! NeXTStep */
109 # define g_ATEXIT(proc) (!atexit (proc))
110 #else
111 @@ -102,25 +164,26 @@
112 #define G_PLATFORM_WIN32
113
114
115 +#ifndef _MSC_VER
116 #define G_VA_COPY va_copy
117 +#endif /* not _MSC_VER */
118
119 #ifdef __cplusplus
120 #define G_HAVE_INLINE 1
121 #else /* !__cplusplus */
122 +#ifndef _MSC_VER
123 #define G_HAVE_INLINE 1
124 +#endif /* _MSC_VER */
125 #define G_HAVE___INLINE 1
126 +#if !defined(_MSC_VER) && !defined(__DMC__)
127 #define G_HAVE___INLINE__ 1
128 +#endif /* !_MSC_VER and !__DMC__ */
129 #endif /* !__cplusplus */
130
131 -#ifdef __cplusplus
132 -#define G_CAN_INLINE 1
133 -#else /* !__cplusplus */
134 #define G_CAN_INLINE 1
135 -#endif
136
137 -#ifndef __cplusplus
138 +#ifndef _MSC_VER
139 # define G_HAVE_ISO_VARARGS 1
140 -#endif
141
142 /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
143 * is passed ISO vararg support is turned off, and there is no work
144 @@ -131,17 +194,15 @@
145 #endif
146
147 #define G_HAVE_GNUC_VARARGS 1
148 +#else /* _MSC_VER */
149 +/* varargs macros available since msvc8 (vs2005) */
150 +# if _MSC_VER >= 1400
151 +# define G_HAVE_ISO_VARARGS 1
152 +# endif
153 +#endif /* not _MSC_VER */
154 #define G_HAVE_GROWING_STACK 0
155
156 -#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
157 -#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
158 -#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
159 -#define G_GNUC_INTERNAL __hidden
160 -#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
161 -#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
162 -#else
163 #define G_GNUC_INTERNAL
164 -#endif
165
166 #define G_THREADS_ENABLED
167 #define G_THREADS_IMPL_WIN32
168 @@ -156,14 +217,16 @@
169 typedef union _GSystemThread GSystemThread;
170 union _GSystemThread
171 {
172 +#ifndef _WIN64
173 char data[4];
174 +#else
175 + char data[8];
176 +#endif
177 double dummy_double;
178 void *dummy_pointer;
179 long dummy_long;
180 };
181
182 -#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1
183 -
184 #define GINT16_TO_LE(val) ((gint16) (val))
185 #define GUINT16_TO_LE(val) ((guint16) (val))
186 #define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.