| blob | 3089f938b17c5bcc9de96916172bcb5d99d73f2a |
1 --- misc/glib-2.28.1/build/win32/dirent/makefile.msc 2009-04-01 01:04:20.000000000 +0200
2 +++ misc/build/glib-2.28.1/build/win32/dirent/makefile.msc 2011-03-04 09:06:56.391118000 +0100
3 @@ -1,10 +1,10 @@
4 TOP = ..\..\..\..
6 -!INCLUDE $(TOP)\glib\build\win32\make.msc
7 +!INCLUDE ..\make.msc
9 dirent_OBJECTS = dirent.obj wdirent.obj
11 -INCLUDES = -I.
12 +INCLUDES = -I. $(SOLARINC)
14 all : dirent.lib
16 @@ -12,5 +12,5 @@
17 lib /out:dirent.lib /nodefaultlib $(dirent_OBJECTS)
19 clean::
20 - del /f $(dirent_OBJECTS)
21 - del /f dirent.lib
22 + rm /f $(dirent_OBJECTS)
23 + rm /f dirent.lib
24 --- misc/glib-2.28.1/build/win32/make.msc 2009-08-29 04:52:21.000000000 +0200
25 +++ misc/build/glib-2.28.1/build/win32/make.msc 2011-03-04 12:36:27.513145100 +0100
26 @@ -35,7 +35,7 @@
27 XSLTPROC = d:\gnome-0\xsltproc
29 # paths and version numbers
30 -!INCLUDE $(TOP)\glib\build\win32\module.defs
31 +!INCLUDE module.defs
33 ################
34 # CFLAGS and LIBS for the packages in module.defs.
35 @@ -58,8 +58,8 @@
36 CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO)
37 CAIRO_LIBS = $(CAIRO)\src\libcairo.lib
39 -DIRENT_CFLAGS = -I $(GLIB)\build\win32\dirent
40 -DIRENT_LIBS = $(GLIB)\build\win32\dirent\dirent.lib
41 +DIRENT_CFLAGS = -I ..\build\win32\dirent
42 +DIRENT_LIBS = ..\build\win32\dirent\dirent.lib
44 !IFNDEF EXIF
45 EXIF_CFLAGS = -I $(DEVTOP)\include
46 @@ -92,7 +92,7 @@
47 # overide definition to use it as callable path
48 GLIB = $(TOP)\glib
50 -GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS)
51 +GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS) $(SOLARINC)
52 GLIB_LIBS = $(GLIB)\glib\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib $(GLIB)\gobject\gobject-$(GLIB_VER).lib $(GLIB)\gio\gio-$(GLIB_VER).lib
53 GTHREAD_LIBS = $(GLIB)\gthread\gthread-$(GLIB_VER).lib
55 @@ -126,11 +126,11 @@
56 LIBART_LIBS = $(LIBART)\art_lgpl_2.lib
58 !IFNDEF INTL
59 -INTL_CFLAGS = -I $(DEVTOP)\include
60 -INTL_LIBS = $(DEVTOP)\lib\intl.lib
61 +INTL_CFLAGS = -I $(OUTDIR)\inc\external
62 +INTL_LIBS = $(OUTDIR)/lib/intl.lib
63 !ELSE
64 -INTL_CFLAGS = -I $(INTL)
65 -INTL_LIBS = $(INTL)\intl.lib
66 +INTL_CFLAGS = -I $(OUTDIR)\inc\external
67 +INTL_LIBS = $(OUTDIR)/lib/intl.lib
68 !ENDIF
70 !IFDEF LCMS
71 @@ -199,10 +199,10 @@
73 !IFDEF ZLIB
74 ZLIB_CFLAGS = -I $(ZLIB)
75 -ZLIB_LIBS = $(ZLIB)\projects\visualc6\Win32_LIB_Release\zlib.lib
76 +ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
77 !ELSE
78 -ZLIB_CFLAGS = -I $(DEVTOP)\include
79 -ZLIB_LIBS = $(DEVTOP)\lib\zdll.lib
80 +ZLIB_CFLAGS = -I $(OUTDIR)\inc\external\zlib
81 +ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
82 !ENDIF
84 ################
85 --- misc/glib-2.28.1/gio/gzlibcompressor.c 2011-02-11 16:23:12.000000000 +0100
86 +++ misc/build/glib-2.28.1/gio/gzlibcompressor.c 2011-03-07 10:33:19.559189800 +0100
87 @@ -25,7 +25,7 @@
88 #include "gzlibcompressor.h"
90 #include <errno.h>
91 -#include <zlib.h>
92 +#include <zlib/zlib.h>
93 #include <string.h>
95 #include "gfileinfo.h"
96 @@ -64,8 +64,10 @@
98 GZlibCompressorFormat format;
99 int level;
100 +#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
101 z_stream zstream;
102 gz_header gzheader;
103 +#endif
104 GFileInfo *file_info;
105 };
107 @@ -73,7 +75,7 @@
108 g_zlib_compressor_set_gzheader (GZlibCompressor *compressor)
109 {
110 /* On win32, these functions were not exported before 1.2.4 */
111 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
112 +#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
113 const gchar *filename;
115 if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
116 --- misc/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-07 09:13:41.324890400 +0100
117 +++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-04 11:28:39.712480200 +0100
118 @@ -25,7 +25,7 @@
119 #include "gzlibdecompressor.h"
121 #include <errno.h>
122 -#include <zlib.h>
123 +#include <zlib/zlib.h>
124 #include <string.h>
126 #include "gfileinfo.h"
127 @@ -76,7 +76,7 @@
128 g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor)
129 {
130 /* On win32, these functions were not exported before 1.2.4 */
131 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
132 +#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
133 if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP)
134 return;
136 @@ -376,7 +376,7 @@
137 *bytes_read = inbuf_size - decompressor->zstream.avail_in;
138 *bytes_written = outbuf_size - decompressor->zstream.avail_out;
140 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
141 +#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
142 if (decompressor->header_data != NULL &&
143 decompressor->header_data->gzheader.done == 1)
144 {
145 --- misc/glib-2.28.1/gio/makefile.msc 2011-02-11 16:23:12.000000000 +0100
146 +++ misc/build/glib-2.28.1/gio/makefile.msc 2011-03-04 12:43:54.423706900 +0100
147 @@ -3,9 +3,9 @@
148 PRJ_TOP = ..
149 PACKAGE = gio
150 PKG_VER = 2.0
151 -!INCLUDE $(TOP)\glib\build\win32\make.msc
152 +!INCLUDE ..\build\win32\make.msc
154 -SUBDIRS = win32
155 +SUBDIRS = win32 gvdb
157 sub-all:
158 for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
159 @@ -18,13 +18,15 @@
160 INCLUDES = \
161 -FImsvc_recommended_pragmas.h \
162 -I .. -I ..\glib -I ..\gmodule -I . \
163 - $(INTL_CFLAGS)
164 + $(INTL_CFLAGS) \
165 + $(SOLARINC) \
167 DEFINES = \
168 -DG_LOG_DOMAIN=\"GLib-GIO\" \
169 -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
170 -DGIO_COMPILATION
172 +
173 appinfo_sources = \
174 gwin32appinfo.c gwin32appinfo.h
176 @@ -75,19 +77,50 @@
177 $(NULL)
179 OBJECTS = \
180 + gaction.obj \
181 + gactiongroup.obj \
182 gappinfo.obj \
183 + gapplication.obj \
184 + gapplicationcommandline.obj \
185 + gapplicationimpl-dbus.obj \
186 gasynchelper.obj \
187 gasyncinitable.obj \
188 gasyncresult.obj \
189 gbufferedinputstream.obj \
190 gbufferedoutputstream.obj \
191 gcancellable.obj \
192 + gcharsetconverter.obj \
193 gcontenttype.obj \
194 + gconverter.obj \
195 + gconverterinputstream.obj \
196 + gconverteroutputstream.obj \
197 + gcredentials.obj \
198 gdatainputstream.obj \
199 gdataoutputstream.obj \
200 + gdbusaddress.obj \
201 + gdbusauth.obj \
202 + gdbusauthmechanism.obj \
203 + gdbusauthmechanismanon.obj \
204 + gdbusauthmechanismexternal.obj \
205 + gdbusauthmechanismsha1.obj \
206 + gdbusauthobserver.obj \
207 + gdbusconnection.obj \
208 + gdbuserror.obj \
209 + gdbusintrospection.obj \
210 + gdbusmessage.obj \
211 + gdbusmethodinvocation.obj \
212 + gdbusnameowning.obj \
213 + gdbusnamewatching.obj \
214 + gdbusprivate.obj \
215 + gdbusproxy.obj \
216 + gdbusserver.obj \
217 + gdbusutils.obj \
218 + gdelayedsettingsbackend.obj \
219 # gdesktopappinfo.obj \
220 gdrive.obj \
221 gdummyfile.obj \
222 + gdummyproxyresolver.obj \
223 + gdummytlsbackend.obj \
224 gemblem.obj \
225 gemblemedicon.obj \
226 gfile.obj \
227 @@ -112,20 +145,39 @@
228 giomodule.obj \
229 gioscheduler.obj \
230 giostream.obj \
231 + gkeyfilesettingsbackend.obj \
232 gloadableicon.obj \
233 glocalfileiostream.obj \
234 gmemoryinputstream.obj \
235 gmemoryoutputstream.obj \
236 + gmemorysettingsbackend.obj \
237 gmount.obj \
238 gmountoperation.obj \
239 gnativevolumemonitor.obj \
240 gnetworkaddress.obj \
241 gnetworkservice.obj \
242 + gnullsettingsbackend.obj \
243 goutputstream.obj \
244 + gpermission.obj \
245 + gpollableinputstream.obj \
246 + gpollableoutputstream.obj \
247 gpollfilemonitor.obj \
248 + gproxy.obj\
249 + gproxyaddress.obj \
250 + gproxyaddressenumerator.obj \
251 + gproxyresolver.obj \
252 + gregistrysettingsbackend.obj \
253 gresolver.obj \
254 + gsettings-mapping.obj \
255 + gsettings-tool.obj \
256 + gsettings.obj \
257 + gsettingsbackend.obj \
258 + gsettingsschema.obj \
259 gseekable.obj \
260 + gsimpleaction.obj \
261 + gsimpleactiongroup.obj \
262 gsimpleasyncresult.obj \
263 + gsimplepermission.obj \
264 gsocket.obj \
265 gsocketaddress.obj \
266 gsocketaddressenumerator.obj \
267 @@ -135,13 +187,22 @@
268 gsocketcontrolmessage.obj \
269 gsocketlistener.obj \
270 gsocketservice.obj \
271 + gsocks4aproxy.obj \
272 + gsocks4proxy.obj \
273 + gsocks5proxy.obj \
274 gsocketinputstream.obj \
275 gsocketoutputstream.obj \
276 gsrvtarget.obj \
277 gtcpconnection.obj \
278 + gtcpwrapperconnection.obj \
279 gthreadedresolver.obj \
280 gthreadedsocketservice.obj \
281 gthemedicon.obj \
282 + gtlsbackend.obj \
283 + gtlscertificate.obj \
284 + gtlsclientconnection.obj \
285 + gtlsconnection.obj \
286 + gtlsserverconnection.obj \
287 gunionvolumemonitor.obj \
288 gvfs.obj \
289 gvolume.obj \
290 @@ -156,11 +217,15 @@
291 glocalfilemonitor.obj \
292 glocaldirectorymonitor.obj \
293 gwin32appinfo.obj \
294 + gwin32outputstream.obj \
295 \
296 gio-marshal.obj \
297 + gwin32inputstream.obj \
298 gwin32mount.obj \
299 gwin32volumemonitor.obj \
300 - gwin32resolver.obj
301 + gwin32resolver.obj \
302 + gzlibdecompressor.obj \
303 + gzlibcompressor.obj
305 libgio_2_0_la_LIBADD = \
306 $(top_builddir)/glib/libglib-2.0.la \
307 @@ -190,14 +255,14 @@
309 gio-marshal.h: gio-marshal.list
310 $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \
311 - && copy /y xgen-gwmh gio-marshal.h \
312 - && del xgen-gwmh xgen-gwmh~
313 + && cp xgen-gwmh gio-marshal.h \
314 + && rm xgen-gwmh xgen-gwmh~
316 gio-marshal.c: gio-marshal.h
317 echo #include "gio-marshal.h" >> xgen-gwmc \
318 && $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \
319 - && copy xgen-gwmc gio-marshal.c \
320 - && del xgen-gwmc xgen-gwmc~
321 + && cp xgen-gwmc gio-marshal.c \
322 + && rm xgen-gwmc xgen-gwmc~
324 local_sources = \
325 glocaldirectorymonitor.c \
326 @@ -228,11 +293,11 @@
327 gio-marshal.c \
328 gioenumtypes.h \
329 gioenumtypes.c \
330 - libgio-$(PKG_VER)-0.dll
331 + giolo.dll
334 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
335 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
336 + cp $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
338 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
339 $(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h
340 @@ -245,14 +310,14 @@
341 RESOURCE = $(PACKAGE).res
343 $(PACKAGE).res : $(PACKAGE).rc
344 - rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
345 + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo $(PACKAGE).res $(PACKAGE).rc
347 -libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE)
348 - $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \
349 +giolo.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE)
350 + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \
351 ..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
352 - win32\giowin32.lib \
353 - $(INTL_LIBS) \
354 - kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \
355 + win32\giowin32.lib gvdb\giogvdb.lib \
356 + $(INTL_LIBS) $(ZLIB_LIBS) \
357 + kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib shlwapi.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \
358 /implib:gio-2.0.lib /def:$(PACKAGE).def
360 .c.obj :
361 --- misc/glib-2.28.1/glib/gatomic.c 2011-02-11 16:23:12.000000000 +0100
362 +++ misc/build/glib-2.28.1/glib/gatomic.c 2011-02-25 15:51:45.000000000 +0100
363 @@ -28,6 +28,7 @@
364 #endif
366 #include "gatomic.h"
367 +#include "gthread.h"
368 #include "gthreadprivate.h"
370 /**
371 --- misc/glib-2.28.1/glib/gnulib/makefile.msc 2009-04-01 01:04:20.000000000 +0200
372 +++ misc/build/glib-2.28.1/glib/gnulib/makefile.msc 2011-03-04 08:37:50.624265900 +0100
373 @@ -1,7 +1,7 @@
374 TOP = ..\..\..
375 !INCLUDE ..\..\build\win32\make.msc
377 -INCLUDES = -I ..\.. -I ..
378 +INCLUDES = -I ..\.. -I .. $(SOLARINC)
379 DEFINES = -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT
381 OBJECTS = \
382 --- misc/glib-2.28.1/glib/makefile.msc 2011-02-18 16:34:53.000000000 +0100
383 +++ misc/build/glib-2.28.1/glib/makefile.msc 2011-03-07 11:41:13.874227300 +0100
384 @@ -7,7 +7,7 @@
386 ################################################################
388 -INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ..
389 +INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. $(SOLARINC)
390 DEFINES = \
391 -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" \
392 -DG_ENABLE_DEBUG -DPCRE_STATIC -DG_DISABLE_DEPRECATED \
393 @@ -17,13 +17,11 @@
395 all : \
396 ..\config.h \
397 - ..\glibconfig.h \
398 + glibconfig.h \
399 gnulib\gnulib.lib \
400 pcre\pcre.lib \
401 - libglib-2.0-0.dll \
402 + gliblo.dll \
403 - glib-2.28s.lib \
404 - gspawn-win32-helper.exe \
405 - gspawn-win32-helper-console.exe \
406 + glib-2.28s.lib
409 gnulib\gnulib.lib :
410 @@ -37,37 +35,40 @@
411 cd ..
413 glib_OBJECTS = \
414 - garray.obj \
415 - gasyncqueue.obj \
416 - gatomic.obj \
417 - gbacktrace.obj \
418 - gbase64.obj \
419 + garray.obj \
420 + gasyncqueue.obj \
421 + gatomic.obj \
422 + gbacktrace.obj \
423 + gbase64.obj \
424 + gbitlock.obj \
425 gbookmarkfile.obj \
426 + gbuffer.obj \
427 gcache.obj \
428 - gchecksum.obj \
429 - gcompletion.obj \
430 + gchecksum.obj \
431 gconvert.obj \
432 + gcompletion.obj \
433 gdataset.obj \
434 gdate.obj \
435 + gdatetime.obj \
436 gdir.obj \
437 gerror.obj \
438 gfileutils.obj \
439 ghash.obj \
440 - ghostutils.obj \
441 ghook.obj \
442 + ghostutils.obj \
443 giochannel.obj \
444 giowin32.obj \
445 - gpoll.obj \
446 gkeyfile.obj \
447 glist.obj \
448 gmain.obj \
449 - gmappedfile.obj \
450 + gmappedfile.obj \
451 gmarkup.obj \
452 gmem.obj \
453 gmessages.obj \
454 gnode.obj \
455 goption.obj \
456 gpattern.obj \
457 + gpoll.obj \
458 gprimes.obj \
459 gprintf.obj \
460 gqsort.obj \
461 @@ -88,22 +89,29 @@
462 gthread.obj \
463 gthreadpool.obj \
464 gtimer.obj \
465 + gtimezone.obj \
466 gtree.obj \
467 gunibreak.obj \
468 gunicollate.obj \
469 gunidecomp.obj \
470 guniprop.obj \
471 gurifuncs.obj \
472 - gutf8.obj \
473 - gutils.obj \
474 - gwin32.obj \
475 + gutf8.obj \
476 + gutils.obj \
477 + gvariant-core.obj \
478 + gvariant-parser.obj \
479 + gvariant-serialiser.obj \
480 + gvariant.obj \
481 + gvarianttype.obj \
482 + gvarianttypeinfo.obj \
483 + gwin32.obj \
484 localcharset.obj
486 -..\glibconfig.h: ..\glibconfig.h.win32
487 - copy ..\glibconfig.h.win32 ..\glibconfig.h
488 +glibconfig.h: glibconfig.h.win32
489 + cp glibconfig.h.win32 glibconfig.h
491 ..\config.h: ..\config.h.win32
492 - copy ..\config.h.win32 ..\config.h
493 + cp ..\config.h.win32 ..\config.h
495 localcharset.obj : libcharset\localcharset.c
496 $(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c
497 @@ -115,7 +123,7 @@
498 -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def
500 glib.res : glib.rc
501 - rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc
502 + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo glib.res glib.rc
504 ################ glib
506 @@ -124,20 +132,14 @@
507 glib-2.28s.lib : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
508 lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
510 -libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
511 +gliblo.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
512 $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \
513 gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \
514 $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
516 -gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-0.dll
517 - $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
518 -
519 -gspawn-win32-helper-console.exe : gspawn-win32-helper.c libglib-2.0-0.dll
520 - $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:console user32.lib
521 -
522 ################ other stuff
524 clean::
525 - del ..\config.h
526 - del ..\glibconfig.h
527 + rm ..\config.h
528 + rm glibconfig.h
530 --- misc/glib-2.28.1/glib/pcre/makefile.msc 2010-06-20 06:35:47.000000000 +0200
531 +++ misc/build/glib-2.28.1/glib/pcre/makefile.msc 2011-03-04 09:06:02.748049800 +0100
532 @@ -3,7 +3,8 @@
534 INCLUDES = \
535 -I ..\.. \
536 - -I ..
537 + -I .. \
538 + $(SOLARINC)
540 DEFINES = \
541 -DPCRE_STATIC \
542 @@ -18,10 +19,24 @@
543 -DMAX_NAME_COUNT=10000 \
544 -DMAX_DUPLENGTH=30000 \
545 -DLINK_SIZE=2 \
546 - -DEBCDIC=0 \
547 -DPOSIX_MALLOC_THRESHOLD=10
549 OBJECTS = \
550 + pcre_chartables.obj \
551 + pcre_compile.obj \
552 + pcre_config.obj \
553 + pcre_dfa_exec.obj \
554 + pcre_exec.obj \
555 + pcre_fullinfo.obj \
556 + pcre_get.obj \
557 + pcre_globals.obj \
558 + pcre_newline.obj \
559 + pcre_ord2utf8.obj \
560 + pcre_study.obj \
561 + pcre_tables.obj \
562 + pcre_try_flipped.obj \
563 + pcre_ucp_searchfuncs.obj \
564 + pcre_xclass.obj \
567 all : pcre.lib
568 --- misc/glib-2.28.1/gmodule/makefile.msc 2011-02-18 16:34:58.000000000 +0100
569 +++ misc/build/glib-2.28.1/gmodule/makefile.msc 2011-03-04 08:43:06.896355600 +0100
570 @@ -7,12 +7,12 @@
572 ################################################################
574 -INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
575 +INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
576 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\"
578 all : \
579 gmoduleconf.h \
580 - libgmodule-2.0-0.dll
581 + gmodulelo.dll
583 gmodule_OBJECTS = \
584 gmodule.obj
585 @@ -16,22 +16,22 @@
587 gmodule_OBJECTS = \
588 gmodule.obj
589 -gmodule.def: gmodule.symbols
590 - echo EXPORTS > gmodule.def
591 - cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
592 - -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
593 - -DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
594 -
595 +gmodule.def: gmodule.symbols
596 + echo EXPORTS > gmodule.def
597 + cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
598 + -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
599 + -DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
600 +
602 gmoduleconf.h: gmoduleconf.h.win32
603 - copy gmoduleconf.h.win32 gmoduleconf.h
604 + cp gmoduleconf.h.win32 gmoduleconf.h
606 gmodule.res : gmodule.rc
607 - rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
608 + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc
610 -libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
611 +gmodulelo.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
612 $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \
613 ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
615 clean::
616 - del gmoduleconf.h
617 + rm gmoduleconf.h
618 --- misc/glib-2.28.1/gobject/makefile.msc 2011-02-18 16:35:05.000000000 +0100
619 +++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-04 12:33:52.399273100 +0100
620 --- misc/glib-2.28.1/gobject/makefile.msc 2011-02-18 16:35:05.000000000 +0100
621 +++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-09 09:29:52.712284300 +0100
622 @@ -7,23 +7,22 @@
624 ################################################################
626 -INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
627 +INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
628 DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \
629 -DG_ENABLE_DEBUG
630 # -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS
631 # -DG_DISABLE_CAST_CHECKS
633 all : \
634 glib-genmarshal.exe \
635 gmarshal.h \
636 - gmarshal.c \
637 gmarshal.strings \
638 - gobject-query.exe \
639 - libgobject-2.0-0.dll \
640 + gobjectlo.dll \
641 gobject-2.28s.lib \
642 - testgobject.exe
644 gobject_OBJECTS = \
645 + gatomicarray.obj \
646 + gbinding.obj \
647 gboxed.obj \
648 gclosure.obj \
649 genums.obj \
650 @@ -47,21 +49,18 @@
651 -DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def
653 gobject.res : gobject.rc
654 - rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc
655 + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gobject.res gobject.rc
657 gmarshal.h : gmarshal.list glib-genmarshal.exe
658 echo #ifndef __G_MARSHAL_H__ > xgen-gmh
659 echo #define __G_MARSHAL_H__ >> xgen-gmh
660 glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --header >> xgen-gmh
661 echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh
662 - copy xgen-gmh gmarshal.h
663 -
664 -gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
665 - glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
666 + cp xgen-gmh gmarshal.h
668 -libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res
669 +gobjectlo.dll : $(gobject_OBJECTS) gobject.def gobject.res
670 $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
671 - ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@
672 + ..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@
674 gobject-2.28s.lib : $(gobject_OBJECTS)
675 lib /out:$@ $(gobject_OBJECTS)
676 --- misc/glib-2.28.1/gthread/makefile.msc 2011-02-18 16:35:00.000000000 +0100
677 +++ misc/build/glib-2.28.1/gthread/makefile.msc 2011-03-04 08:43:06.900355800 +0100
678 @@ -7,10 +7,10 @@
680 ################################################################
682 -INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
683 +INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
684 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
685 all : \
686 - libgthread-2.0-0.dll
687 + gthreadlo.dll
689 gthread_OBJECTS = \
690 gthread-impl.obj
691 @@ -19,8 +19,8 @@
692 $(CC) -c $(CFLAGS) gthread-impl.c
694 gthread.res : gthread.rc
695 - rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc
696 + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc
698 -libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res
699 +gthreadlo.dll : $(gthread_OBJECTS) gthread.def gthread.res
700 $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
701 ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
702 --- misc/glib-2.28.1/makefile.msc 2009-04-01 01:04:20.000000000 +0200
703 +++ misc/build/glib-2.28.1/makefile.msc 2011-03-04 09:11:06.663432800 +0100
704 @@ -1,7 +1,7 @@
705 ## Makefile for building the GLib dlls with Microsoft C
706 ## Use: nmake -f makefile.msc
708 -PARTS = glib gmodule gthread gobject gio tests
709 +PARTS = "build\win32\dirent" glib gmodule gthread gobject gio tests
711 all : \
712 config.h \
713 @@ -22,7 +22,7 @@
714 @cd ..
716 config.h: config.h.win32
717 - copy config.h.win32 config.h
718 + cp config.h.win32 config.h
720 -glibconfig.h: glibconfig.h.win32
721 - copy glibconfig.h.win32 glibconfig.h
722 +glibconfig.h: glib/glibconfig.h.win32
723 + cp glib/glibconfig.h.win32 glib/glibconfig.h
724 --- misc/glib-2.28.1/tests/makefile.msc 2011-02-18 16:35:43.000000000 +0100
725 +++ misc/build/glib-2.28.1/tests/makefile.msc 2011-03-04 08:33:02.079762100 +0100
726 @@ -7,7 +7,7 @@
728 ################################################################
730 -INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule
731 +INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule $(SOLARINC)
732 DEFINES = -DHAVE_CONFIG_H -DENABLE_REGEX
734 NONAUTOMATIC_TESTS = \
735 @@ -79,7 +79,7 @@
736 libmoduletestplugin_a.dll \
737 libmoduletestplugin_b.dll
739 -all : $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
740 +all :
742 .c.exe :
743 $(CC) $(CFLAGS) -c $<
744 --- misc/glib-2.28.1/glib/glibconfig.h Wed Aug 20 14:33:55 2008
745 +++ misc/build/glib-2.28.1/glib/glibconfig.h Wed Aug 20 14:26:42 2008
746 @@ -1 +1,285 @@
747 -dummy
748 +/* glibconfig.h.win32.in. Originally merged from two versions of
749 + * glibconfig.h, generated by the GLib configure script, for gcc and
750 + * MSVC.
751 + */
752 +
753 +/* glibconfig.h
754 + *
755 + * This is a generated file. Please modify 'glibconfig.h.win32.in'
756 + */
757 +
758 +#ifndef __G_LIBCONFIG_H__
759 +#define __G_LIBCONFIG_H__
760 +
761 +#include <glib/gmacros.h>
762 +
763 +#include <limits.h>
764 +#include <float.h>
765 +
766 +G_BEGIN_DECLS
767 +
768 +#define G_MINFLOAT FLT_MIN
769 +#define G_MAXFLOAT FLT_MAX
770 +#define G_MINDOUBLE DBL_MIN
771 +#define G_MAXDOUBLE DBL_MAX
772 +#define G_MINSHORT SHRT_MIN
773 +#define G_MAXSHORT SHRT_MAX
774 +#define G_MAXUSHORT USHRT_MAX
775 +#define G_MININT INT_MIN
776 +#define G_MAXINT INT_MAX
777 +#define G_MAXUINT UINT_MAX
778 +#define G_MINLONG LONG_MIN
779 +#define G_MAXLONG LONG_MAX
780 +#define G_MAXULONG ULONG_MAX
781 +
782 +typedef signed char gint8;
783 +typedef unsigned char guint8;
784 +typedef signed short gint16;
785 +typedef unsigned short guint16;
786 +#define G_GINT16_MODIFIER "h"
787 +#define G_GINT16_FORMAT "hi"
788 +#define G_GUINT16_FORMAT "hu"
789 +typedef signed int gint32;
790 +typedef unsigned int guint32;
791 +#define G_GINT32_MODIFIER ""
792 +#define G_GINT32_FORMAT "i"
793 +#define G_GUINT32_FORMAT "u"
794 +#define G_HAVE_GINT64 1 /* deprecated, always true */
795 +
796 +#ifndef _MSC_VER
797 +G_GNUC_EXTENSION typedef signed long long gint64;
798 +G_GNUC_EXTENSION typedef unsigned long long guint64;
799 +#else /* _MSC_VER */
800 +typedef signed __int64 gint64;
801 +typedef unsigned __int64 guint64;
802 +#endif /* _MSC_VER */
803 +
804 +#ifndef _MSC_VER
805 +#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
806 +#else /* _MSC_VER */
807 +#define G_GINT64_CONSTANT(val) (val##i64)
808 +#endif /* _MSC_VER */
809 +#ifndef _MSC_VER
810 +#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
811 +#else /* _MSC_VER */
812 +#define G_GUINT64_CONSTANT(val) (val##Ui64)
813 +#endif /* _MSC_VER */
814 +#define G_GINT64_MODIFIER "I64"
815 +#define G_GINT64_FORMAT "I64i"
816 +#define G_GUINT64_FORMAT "I64u"
817 +
818 +#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
819 +
820 +#define GLIB_SIZEOF_VOID_P 8
821 +#define GLIB_SIZEOF_LONG 4
822 +#define GLIB_SIZEOF_SIZE_T 8
823 +
824 +typedef signed long long gssize;
825 +typedef unsigned long long gsize;
826 +#define G_GSIZE_MODIFIER "I64"
827 +#define G_GSSIZE_FORMAT "I64d"
828 +#define G_GSIZE_FORMAT "I64u"
829 +
830 +#define G_MAXSIZE G_MAXUINT64
831 +#define G_MINSSIZE G_MININT64
832 +#define G_MAXSSIZE G_MAXINT64
833 +
834 +#else
835 +
836 +#define GLIB_SIZEOF_VOID_P 4
837 +#define GLIB_SIZEOF_LONG 4
838 +#define GLIB_SIZEOF_SIZE_T 4
839 +
840 +typedef signed int gssize;
841 +typedef unsigned int gsize;
842 +#define G_GSIZE_MODIFIER ""
843 +#define G_GSSIZE_FORMAT "i"
844 +#define G_GSIZE_FORMAT "u"
845 +
846 +#define G_MAXSIZE G_MAXUINT
847 +#define G_MINSSIZE G_MININT
848 +#define G_MAXSSIZE G_MAXINT
849 +
850 +#endif
851 +
852 +typedef gint64 goffset;
853 +#define G_MINOFFSET G_MININT64
854 +#define G_MAXOFFSET G_MAXINT64
855 +
856 +#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER
857 +#define G_GOFFSET_FORMAT G_GINT64_FORMAT
858 +#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
859 +
860 +
861 +#ifndef _WIN64
862 +
863 +#define GPOINTER_TO_INT(p) ((gint) (p))
864 +#define GPOINTER_TO_UINT(p) ((guint) (p))
865 +
866 +#define GINT_TO_POINTER(i) ((gpointer) (i))
867 +#define GUINT_TO_POINTER(u) ((gpointer) (u))
868 +
869 +typedef signed int gintptr;
870 +typedef unsigned int guintptr;
871 +
872 +#define G_GINTPTR_MODIFIER ""
873 +#define G_GINTPTR_FORMAT "i"
874 +#define G_GUINTPTR_FORMAT "u"
875 +
876 +#else
877 +
878 +#define GPOINTER_TO_INT(p) ((gint) (gint64) (p))
879 +#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p))
880 +
881 +#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i))
882 +#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u))
883 +
884 +#ifndef _MSC_VER
885 +typedef signed long long gintptr;
886 +typedef unsigned long long guintptr;
887 +#else
888 +typedef signed __int64 gintptr;
889 +typedef unsigned __int64 guintptr;
890 +#endif
891 +
892 +#define G_GINTPTR_MODIFIER "I64"
893 +#define G_GINTPTR_FORMAT "I64i"
894 +#define G_GUINTPTR_FORMAT "I64u"
895 +
896 +#endif
897 +
898 +#ifdef NeXT /* @#%@! NeXTStep */
899 +# define g_ATEXIT(proc) (!atexit (proc))
900 +#else
901 +# define g_ATEXIT(proc) (atexit (proc))
902 +#endif
903 +
904 +#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
905 +
906 +#define GLIB_MAJOR_VERSION 2
907 +#define GLIB_MINOR_VERSION 28
908 +#define GLIB_MICRO_VERSION 1
909 +
910 +#define G_OS_WIN32
911 +#define G_PLATFORM_WIN32
912 +
913 +
914 +#ifndef _MSC_VER
915 +#define G_VA_COPY va_copy
916 +#endif /* not _MSC_VER */
917 +
918 +#ifdef __cplusplus
919 +#define G_HAVE_INLINE 1
920 +#else /* !__cplusplus */
921 +#ifndef _MSC_VER
922 +#define G_HAVE_INLINE 1
923 +#endif /* _MSC_VER */
924 +#define G_HAVE___INLINE 1
925 +#if !defined(_MSC_VER) && !defined(__DMC__)
926 +#define G_HAVE___INLINE__ 1
927 +#endif /* !_MSC_VER and !__DMC__ */
928 +#endif /* !__cplusplus */
929 +
930 +#define G_CAN_INLINE 1
931 +
932 +#ifndef _MSC_VER
933 +#define G_HAVE_ISO_VARARGS 1
934 +
935 +/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
936 + * is passed ISO vararg support is turned off, and there is no work
937 + * around to turn it on, so we unconditionally turn it off.
938 + */
939 +#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
940 +# undef G_HAVE_ISO_VARARGS
941 +#endif
942 +
943 +#define G_HAVE_GNUC_VARARGS 1
944 +#else /* _MSC_VER */
945 +/* varargs macros available since msvc8 (vs2005) */
946 +# if _MSC_VER >= 1400
947 +# define G_HAVE_ISO_VARARGS 1
948 +# endif
949 +#endif /* not _MSC_VER */
950 +#define G_HAVE_GROWING_STACK 0
951 +
952 +#define G_GNUC_INTERNAL
953 +
954 +#define G_THREADS_ENABLED
955 +#define G_THREADS_IMPL_WIN32
956 +typedef struct _GMutex* GStaticMutex;
957 +#define G_STATIC_MUTEX_INIT NULL
958 +#define g_static_mutex_get_mutex(mutex) \
959 + (g_static_mutex_get_mutex_impl_shortcut (mutex))
960 +/* This represents a system thread as used by the implementation. An
961 + * alien implementaion, as loaded by g_thread_init can only count on
962 + * "sizeof (gpointer)" bytes to store their info. We however need more
963 + * for some of our native implementations. */
964 +typedef union _GSystemThread GSystemThread;
965 +union _GSystemThread
966 +{
967 +#ifndef _WIN64
968 + char data[4];
969 +#else
970 + char data[8];
971 +#endif
972 + double dummy_double;
973 + void *dummy_pointer;
974 + long dummy_long;
975 +};
976 +
977 +#define GINT16_TO_LE(val) ((gint16) (val))
978 +#define GUINT16_TO_LE(val) ((guint16) (val))
979 +#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
980 +#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
981 +#define GINT32_TO_LE(val) ((gint32) (val))
982 +#define GUINT32_TO_LE(val) ((guint32) (val))
983 +#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
984 +#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
985 +#define GINT64_TO_LE(val) ((gint64) (val))
986 +#define GUINT64_TO_LE(val) ((guint64) (val))
987 +#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
988 +#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
989 +#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
990 +#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
991 +#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
992 +#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
993 +#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
994 +#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
995 +#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
996 +#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
997 +#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val))
998 +#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val))
999 +#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val))
1000 +#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val))
1001 +#define G_BYTE_ORDER G_LITTLE_ENDIAN
1002 +
1003 +#define GLIB_SYSDEF_POLLIN =1
1004 +#define GLIB_SYSDEF_POLLOUT =4
1005 +#define GLIB_SYSDEF_POLLPRI =2
1006 +#define GLIB_SYSDEF_POLLHUP =16
1007 +#define GLIB_SYSDEF_POLLERR =8
1008 +#define GLIB_SYSDEF_POLLNVAL =32
1009 +
1010 +#define G_MODULE_SUFFIX "dll"
1011 +
1012 +/* A GPid is an abstraction for a process "handle". It is *not* an
1013 + * abstraction for a process identifier in general. GPid is used in
1014 + * GLib only for descendant processes spawned with the g_spawn*
1015 + * functions. On POSIX there is no "process handle" concept as such,
1016 + * but on Windows a GPid is a handle to a process, a kind of pointer,
1017 + * not a process identifier.
1018 + */
1019 +typedef void * GPid;
1020 +
1021 +#define GLIB_SYSDEF_AF_UNIX 1
1022 +#define GLIB_SYSDEF_AF_INET 2
1023 +#define GLIB_SYSDEF_AF_INET6 23
1024 +
1025 +#define GLIB_SYSDEF_MSG_OOB 1
1026 +#define GLIB_SYSDEF_MSG_PEEK 2
1027 +#define GLIB_SYSDEF_MSG_DONTROUTE 4
1028 +
1029 +G_END_DECLS
1030 +
1031 +#endif /* GLIBCONFIG_H */
1032 +
1033 --- misc/glib-2.28.1/gmodule/gmoduleconf.h Wed Aug 20 14:33:55 2008
1034 +++ misc/build/glib-2.28.1/gmodule/gmoduleconf.h Wed Aug 20 14:26:42 2008
1035 @@ -1 +1,45 @@
1036 -dummy
1037 +/* GMODULE - GLIB wrapper code for dynamic module loading
1038 + * Copyright (C) 1998 Tim Janik
1039 + *
1040 + * This library is free software; you can redistribute it and/or
1041 + * modify it under the terms of the GNU Lesser General Public
1042 + * License as published by the Free Software Foundation; either
1043 + * version 2 of the License, or (at your option) any later version.
1044 + *
1045 + * This library is distributed in the hope that it will be useful,
1046 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1047 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1048 + * Lesser General Public License for more details.
1049 + *
1050 + * You should have received a copy of the GNU Lesser General Public
1051 + * License along with this library; if not, write to the
1052 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
1053 + * Boston, MA 02111-1307, USA.
1054 + */
1055 +#ifndef __G_MODULE_CONF_H__
1056 +#define __G_MODULE_CONF_H__
1057 +
1058 +
1059 +#ifdef __cplusplus
1060 +extern "C" {
1061 +#endif /* __cplusplus */
1062 +
1063 +
1064 +#define G_MODULE_IMPL_NONE 0
1065 +#define G_MODULE_IMPL_DL 1
1066 +#define G_MODULE_IMPL_DLD 2
1067 +#define G_MODULE_IMPL_WIN32 3
1068 +#define G_MODULE_IMPL_OS2 4
1069 +#define G_MODULE_IMPL_BEOS 5
1070 +#define G_MODULE_IMPL_DYLD 6
1071 +
1072 +#define G_MODULE_IMPL G_MODULE_IMPL_WIN32
1073 +#undef G_MODULE_HAVE_DLERROR
1074 +
1075 +#ifdef __cplusplus
1076 +}
1077 +#endif /* __cplusplus */
1078 +
1079 +
1080 +#endif /* __G_MODULE_CONF_H__ */
1081 +
1082 --- misc/glib-2.28.1/config.h Wed Aug 20 14:33:55 2008
1083 +++ misc/build/glib-2.28.1/config.h Wed Aug 20 14:26:42 2008
1084 @@ -1 +1,834 @@
1085 -dummy
1086 +/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */
1087 +/* config.h. Generated by configure. */
1088 +/* config.h.in. Generated from configure.ac by autoheader. */
1089 +
1090 +/* Define if building universal (internal helper macro) */
1091 +/* #undef AC_APPLE_UNIVERSAL_BUILD */
1092 +
1093 +/* define if asm blocks can use numeric local labels */
1094 +/* #undef ASM_NUMERIC_LABELS */
1095 +
1096 +/* poll doesn't work on devices */
1097 +#define BROKEN_POLL 1
1098 +
1099 +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
1100 + systems. This function is required for `alloca.c' support on those systems.
1101 + */
1102 +/* #undef CRAY_STACKSEG_END */
1103 +
1104 +/* Define to 1 if using `alloca.c'. */
1105 +/* #undef C_ALLOCA */
1106 +
1107 +/* Whether to disable memory pools */
1108 +/* #undef DISABLE_MEM_POOLS */
1109 +
1110 +/* Whether to enable GC friendliness by default */
1111 +/* #undef ENABLE_GC_FRIENDLY_DEFAULT */
1112 +
1113 +/* always defined to indicate that i18n is enabled */
1114 +#define ENABLE_NLS 1
1115 +
1116 +/* include GRegex */
1117 +#define ENABLE_REGEX /**/
1118 +
1119 +/* Define the gettext package to be used */
1120 +#define GETTEXT_PACKAGE "glib20"
1121 +
1122 +/* Define to the GLIB binary age */
1123 +#define GLIB_BINARY_AGE 2801
1124 +
1125 +/* Byte contents of gmutex */
1126 +/* #undef GLIB_BYTE_CONTENTS_GMUTEX */
1127 +
1128 +/* Define to the GLIB interface age */
1129 +#define GLIB_INTERFACE_AGE 1
1130 +
1131 +/* Define the location where the catalogs will be installed */
1132 +#define GLIB_LOCALE_DIR "NONE/share/locale"
1133 +
1134 +/* Define to the GLIB major version */
1135 +#define GLIB_MAJOR_VERSION 2
1136 +
1137 +/* Define to the GLIB micro version */
1138 +#define GLIB_MICRO_VERSION 1
1139 +
1140 +/* Define to the GLIB minor version */
1141 +#define GLIB_MINOR_VERSION 28
1142 +
1143 +/* The size of gmutex, as computed by sizeof. */
1144 +/* #undef GLIB_SIZEOF_GMUTEX */
1145 +
1146 +/* The size of system_thread, as computed by sizeof. */
1147 +#define GLIB_SIZEOF_SYSTEM_THREAD 4
1148 +
1149 +/* alpha atomic implementation */
1150 +/* #undef G_ATOMIC_ALPHA */
1151 +
1152 +/* arm atomic implementation */
1153 +/* #undef G_ATOMIC_ARM */
1154 +
1155 +/* cris atomic implementation */
1156 +/* #undef G_ATOMIC_CRIS */
1157 +
1158 +/* crisv32 atomic implementation */
1159 +/* #undef G_ATOMIC_CRISV32 */
1160 +
1161 +/* i486 atomic implementation */
1162 +#ifndef _MSC_VER
1163 +#define G_ATOMIC_I486 1
1164 +#endif /* _MSC_VER */
1165 +
1166 +/* ia64 atomic implementation */
1167 +/* #undef G_ATOMIC_IA64 */
1168 +
1169 +/* powerpc atomic implementation */
1170 +/* #undef G_ATOMIC_POWERPC */
1171 +
1172 +/* s390 atomic implementation */
1173 +/* #undef G_ATOMIC_S390 */
1174 +
1175 +/* sparcv9 atomic implementation */
1176 +/* #undef G_ATOMIC_SPARCV9 */
1177 +
1178 +/* x86_64 atomic implementation */
1179 +/* #undef G_ATOMIC_X86_64 */
1180 +
1181 +/* Have inline keyword */
1182 +#ifndef _MSC_VER
1183 +#define G_HAVE_INLINE 1
1184 +#else /* _MSC_VER */
1185 +/* #undef G_HAVE_INLINE */
1186 +#endif /* _MSC_VER */
1187 +
1188 +/* Have __inline keyword */
1189 +#define G_HAVE___INLINE 1
1190 +
1191 +/* Have __inline__ keyword */
1192 +#if !defined(_MSC_VER) && !defined(__DMC__)
1193 +#define G_HAVE___INLINE__ 1
1194 +#else /* _MSC_VER or __DMC__ */
1195 +/* #undef G_HAVE___INLINE__ */
1196 +#endif /* _MSC_VER or __DMC__ */
1197 +
1198 +/* Source file containing theread implementation */
1199 +#define G_THREAD_SOURCE "gthread-win32.c"
1200 +
1201 +/* A 'va_copy' style function */
1202 +#ifndef _MSC_VER
1203 +#define G_VA_COPY va_copy
1204 +#else /* _MSC_VER */
1205 +/* #undef G_VA_COPY */
1206 +#endif /* _MSC_VER */
1207 +
1208 +/* 'va_lists' cannot be copies as values */
1209 +/* #undef G_VA_COPY_AS_ARRAY */
1210 +
1211 +/* Define to 1 if you have `alloca', as a function or macro. */
1212 +#define HAVE_ALLOCA 1
1213 +
1214 +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
1215 + */
1216 +/* #undef HAVE_ALLOCA_H */
1217 +
1218 +/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
1219 +/* #undef HAVE_ARPA_NAMESER_COMPAT_H */
1220 +
1221 +/* Define to 1 if you have the `atexit' function. */
1222 +#define HAVE_ATEXIT 1
1223 +
1224 +/* Define to 1 if you have the <attr/xattr.h> header file. */
1225 +/* #undef HAVE_ATTR_XATTR_H */
1226 +
1227 +/* Define to 1 if you have the `bind_textdomain_codeset' function. */
1228 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1
1229 +
1230 +/* Define if you have a version of the snprintf function with semantics as
1231 + specified by the ISO C99 standard. */
1232 +/* #undef HAVE_C99_SNPRINTF */
1233 +
1234 +/* Define if you have a version of the vsnprintf function with semantics as
1235 + specified by the ISO C99 standard. */
1236 +/* #undef HAVE_C99_VSNPRINTF */
1237 +
1238 +/* define to 1 if Carbon is available */
1239 +/* #undef HAVE_CARBON */
1240 +
1241 +/* Define to 1 if you have the `chown' function. */
1242 +/* #undef HAVE_CHOWN */
1243 +
1244 +/* Define to 1 if you have the `clock_gettime' function. */
1245 +/* #undef HAVE_CLOCK_GETTIME */
1246 +
1247 +/* Have nl_langinfo (CODESET) */
1248 +/* #undef HAVE_CODESET */
1249 +
1250 +/* Define to 1 if you have the <crt_externs.h> header file. */
1251 +/* #undef HAVE_CRT_EXTERNS_H */
1252 +
1253 +/* Define if dbus-1 is available */
1254 +/* #undef HAVE_DBUS1 */
1255 +
1256 +/* Define to 1 if you have the `dcgettext' function. */
1257 +#define HAVE_DCGETTEXT 1
1258 +
1259 +/* Define to 1 if you have the <dirent.h> header file. */
1260 +#ifndef _MSC_VER
1261 +#define HAVE_DIRENT_H 1
1262 +#else
1263 +/* #undef HAVE_DIRENT_H */
1264 +#endif
1265 +
1266 +/* Define to 1 if you have the <dlfcn.h> header file. */
1267 +/* #undef HAVE_DLFCN_H */
1268 +
1269 +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
1270 +/* #undef HAVE_DOPRNT */
1271 +
1272 +/* define for working do while(0) macros */
1273 +#define HAVE_DOWHILE_MACROS 1
1274 +
1275 +/* Define to 1 if you have the `endmntent' function. */
1276 +/* #undef HAVE_ENDMNTENT */
1277 +
1278 +/* Define to 1 if you have the `endservent' function. */
1279 +/* #undef HAVE_ENDSERVENT */
1280 +
1281 +/* Define if we have FAM */
1282 +/* #undef HAVE_FAM */
1283 +
1284 +/* Define to 1 if you have the <fam.h> header file. */
1285 +/* #undef HAVE_FAM_H */
1286 +
1287 +/* Define if we have FAMNoExists in fam */
1288 +/* #undef HAVE_FAM_NO_EXISTS */
1289 +
1290 +/* Define to 1 if you have the `fchmod' function. */
1291 +/* #undef HAVE_FCHMOD */
1292 +
1293 +/* Define to 1 if you have the `fchown' function. */
1294 +/* #undef HAVE_FCHOWN */
1295 +
1296 +/* Define to 1 if you have the `fdwalk' function. */
1297 +/* #undef HAVE_FDWALK */
1298 +
1299 +/* Define to 1 if you have the <float.h> header file. */
1300 +#define HAVE_FLOAT_H 1
1301 +
1302 +/* Define to 1 if you have the <fstab.h> header file. */
1303 +/* #undef HAVE_FSTAB_H */
1304 +
1305 +/* Define to 1 if you have the `fsync' function. */
1306 +/* #undef HAVE_FSYNC */
1307 +
1308 +/* we have the futex(2) system call */
1309 +/* #undef HAVE_FUTEX */
1310 +
1311 +/* Define to 1 if you have the `getcwd' function. */
1312 +#define HAVE_GETCWD 1
1313 +
1314 +/* Define to 1 if you have the `getc_unlocked' function. */
1315 +/* #undef HAVE_GETC_UNLOCKED */
1316 +
1317 +/* Define to 1 if you have the `getgrgid' function. */
1318 +/* #undef HAVE_GETGRGID */
1319 +
1320 +/* Define to 1 if you have the `getmntent_r' function. */
1321 +/* #undef HAVE_GETMNTENT_R */
1322 +
1323 +/* Define to 1 if you have the `getmntinfo' function. */
1324 +/* #undef HAVE_GETMNTINFO */
1325 +
1326 +/* Define to 1 if you have the `getprotobyname_r' function. */
1327 +/* #undef HAVE_GETPROTOBYNAME_R */
1328 +
1329 +/* Define to 1 if you have the `getpwuid' function. */
1330 +/* #undef HAVE_GETPWUID */
1331 +
1332 +/* Define if the GNU gettext() function is already present or preinstalled. */
1333 +#define HAVE_GETTEXT 1
1334 +
1335 +/* Define to 1 if you have the `gmtime_r' function. */
1336 +/* #undef HAVE_GMTIME_R */
1337 +
1338 +/* define to use system printf */
1339 +/* #undef HAVE_GOOD_PRINTF */
1340 +
1341 +/* Define to 1 if you have the <grp.h> header file. */
1342 +/* #undef HAVE_GRP_H */
1343 +
1344 +/* Define to 1 if you have the `hasmntopt' function. */
1345 +/* #undef HAVE_HASMNTOPT */
1346 +
1347 +/* Define to 1 if you have the `inotify_init1' function. */
1348 +/* #undef HAVE_INOTIFY_INIT1 */
1349 +
1350 +/* define to support printing 64-bit integers with format I64 */
1351 +#define HAVE_INT64_AND_I64 1
1352 +
1353 +/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
1354 +#ifndef _MSC_VER
1355 +#define HAVE_INTMAX_T 1
1356 +#else /* _MSC_VER */
1357 +/* #undef HAVE_INTMAX_T */
1358 +#endif /* _MSC_VER */
1359 +
1360 +/* Define to 1 if you have the <inttypes.h> header file. */
1361 +#ifndef _MSC_VER
1362 +#define HAVE_INTTYPES_H 1
1363 +#else /* _MSC_VER */
1364 +/* #undef HAVE_INTTYPES_H */
1365 +#endif /* _MSC_VER */
1366 +
1367 +/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
1368 + declares uintmax_t. */
1369 +#ifndef _MSC_VER
1370 +#define HAVE_INTTYPES_H_WITH_UINTMAX 1
1371 +#else /* _MSC_VER */
1372 +/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
1373 +#endif /* _MSC_VER */
1374 +
1375 +/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
1376 +/* #undef HAVE_LANGINFO_CODESET */
1377 +
1378 +/* Define to 1 if you have the `lchmod' function. */
1379 +/* #undef HAVE_LCHMOD */
1380 +
1381 +/* Define to 1 if you have the `lchown' function. */
1382 +/* #undef HAVE_LCHOWN */
1383 +
1384 +/* Define if your <locale.h> file defines LC_MESSAGES. */
1385 +/* #undef HAVE_LC_MESSAGES */
1386 +
1387 +/* Define to 1 if you have the <limits.h> header file. */
1388 +#define HAVE_LIMITS_H 1
1389 +
1390 +/* Define to 1 if you have the `link' function. */
1391 +/* #undef HAVE_LINK */
1392 +
1393 +/* Define to 1 if you have the <locale.h> header file. */
1394 +#define HAVE_LOCALE_H 1
1395 +
1396 +/* Define to 1 if you have the `localtime_r' function. */
1397 +/* #undef HAVE_LOCALTIME_R */
1398 +
1399 +/* Define if you have the 'long double' type. */
1400 +#define HAVE_LONG_DOUBLE 1
1401 +
1402 +/* Define if you have the 'long long' type. */
1403 +#ifndef _MSC_VER
1404 +#define HAVE_LONG_LONG 1
1405 +#else /* _MSC_VER */
1406 +/* #undef HAVE_LONG_LONG */
1407 +#endif /* _MSC_VER */
1408 +
1409 +/* define if system printf can print long long */
1410 +#define HAVE_LONG_LONG_FORMAT 1
1411 +
1412 +/* Define to 1 if you have the `lstat' function. */
1413 +/* #undef HAVE_LSTAT */
1414 +
1415 +/* Define to 1 if you have the <malloc.h> header file. */
1416 +#define HAVE_MALLOC_H 1
1417 +
1418 +/* Define to 1 if you have the `memalign' function. */
1419 +/* #undef HAVE_MEMALIGN */
1420 +
1421 +/* Define to 1 if you have the `memmem' function. */
1422 +/* #undef HAVE_MEMMEM */
1423 +
1424 +/* Define to 1 if you have the `memmove' function. */
1425 +#define HAVE_MEMMOVE 1
1426 +
1427 +/* Define to 1 if you have the <memory.h> header file. */
1428 +#define HAVE_MEMORY_H 1
1429 +
1430 +/* Define to 1 if you have the `mmap' function. */
1431 +/* #undef HAVE_MMAP */
1432 +
1433 +/* Define to 1 if you have the <mntent.h> header file. */
1434 +/* #undef HAVE_MNTENT_H */
1435 +
1436 +/* Have a monotonic clock */
1437 +/* #undef HAVE_MONOTONIC_CLOCK */
1438 +
1439 +/* Define to 1 if you have the `nanosleep' function. */
1440 +/* #undef HAVE_NANOSLEEP */
1441 +
1442 +/* Define to 1 if you have the <netdb.h> header file. */
1443 +/* #undef HAVE_NETDB_H */
1444 +
1445 +/* Have non-POSIX function getgrgid_r */
1446 +/* #undef HAVE_NONPOSIX_GETGRGID_R */
1447 +
1448 +/* Have non-POSIX function getpwuid_r */
1449 +/* #undef HAVE_NONPOSIX_GETPWUID_R */
1450 +
1451 +/* Define to 1 if you have the `nsleep' function. */
1452 +/* #undef HAVE_NSLEEP */
1453 +
1454 +/* Define to 1 if you have the `on_exit' function. */
1455 +/* #undef HAVE_ON_EXIT */
1456 +
1457 +/* Define to 1 if you have the `pipe2' function. */
1458 +/* #undef HAVE_PIPE2 */
1459 +
1460 +/* Define to 1 if you have the `poll' function. */
1461 +/* #undef HAVE_POLL */
1462 +
1463 +/* Have POSIX function getgrgid_r */
1464 +/* #undef HAVE_POSIX_GETGRGID_R */
1465 +
1466 +/* Have POSIX function getpwuid_r */
1467 +/* #undef HAVE_POSIX_GETPWUID_R */
1468 +
1469 +/* Define to 1 if you have the `posix_memalign' function. */
1470 +/* #undef HAVE_POSIX_MEMALIGN */
1471 +
1472 +/* Have function pthread_attr_setstacksize */
1473 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
1474 +
1475 +/* Define to 1 if the system has the type `ptrdiff_t'. */
1476 +#define HAVE_PTRDIFF_T 1
1477 +
1478 +/* Define to 1 if you have the <pwd.h> header file. */
1479 +/* #undef HAVE_PWD_H */
1480 +
1481 +/* Define to 1 if you have the `readlink' function. */
1482 +/* #undef HAVE_READLINK */
1483 +
1484 +/* Define to 1 if you have the <sched.h> header file. */
1485 +/* #undef HAVE_SCHED_H */
1486 +
1487 +/* Define to 1 if libselinux is available */
1488 +/* #undef HAVE_SELINUX */
1489 +
1490 +/* Define to 1 if you have the <selinux/selinux.h> header file. */
1491 +/* #undef HAVE_SELINUX_SELINUX_H */
1492 +
1493 +/* Define to 1 if you have the `setenv' function. */
1494 +/* #undef HAVE_SETENV */
1495 +
1496 +/* Define to 1 if you have the `setlocale' function. */
1497 +#define HAVE_SETLOCALE 1
1498 +
1499 +/* Define to 1 if you have the `setmntent' function. */
1500 +/* #undef HAVE_SETMNTENT */
1501 +
1502 +/* Define to 1 if you have the `setresuid' function. */
1503 +/* #undef HAVE_SETRESUID */
1504 +
1505 +/* Define to 1 if you have the `setreuid' function. */
1506 +/* #undef HAVE_SETREUID */
1507 +
1508 +/* Define to 1 if you have the `snprintf' function. */
1509 +#ifndef _MSC_VER
1510 +#define HAVE_SNPRINTF 1
1511 +#ifdef __DMC__
1512 +#define snprintf _snprintf
1513 +#endif
1514 +#else /* _MSC_VER */
1515 +/* #undef HAVE_SNPRINTF */
1516 +#endif /* _MSC_VER */
1517 +
1518 +/* Define to 1 if you have the `splice' function. */
1519 +/* #undef HAVE_SPLICE */
1520 +
1521 +/* Define to 1 if you have the `statfs' function. */
1522 +/* #undef HAVE_STATFS */
1523 +
1524 +/* Define to 1 if you have the `statvfs' function. */
1525 +/* #undef HAVE_STATVFS */
1526 +
1527 +/* Define to 1 if you have the <stddef.h> header file. */
1528 +#define HAVE_STDDEF_H 1
1529 +
1530 +/* Define to 1 if you have the <stdint.h> header file. */
1531 +#ifndef _MSC_VER
1532 +#define HAVE_STDINT_H 1
1533 +#else /* _MSC_VER */
1534 +/* #undef HAVE_STDINT_H */
1535 +#endif /* _MSC_VER */
1536 +
1537 +/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
1538 + uintmax_t. */
1539 +#ifndef _MSC_VER
1540 +#define HAVE_STDINT_H_WITH_UINTMAX 1
1541 +#else /* _MSC_VER */
1542 +/* #undef HAVE_STDINT_H_WITH_UINTMAX */
1543 +#endif /* _MSC_VER */
1544 +
1545 +/* Define to 1 if you have the <stdlib.h> header file. */
1546 +#define HAVE_STDLIB_H 1
1547 +
1548 +/* Define to 1 if you have the `stpcpy' function. */
1549 +/* #undef HAVE_STPCPY */
1550 +
1551 +/* Define to 1 if you have the `strcasecmp' function. */
1552 +#if !defined(_MSC_VER) && !defined(__DMC__)
1553 +#define HAVE_STRCASECMP 1
1554 +#else /* _MSC_VER or __DMC__ */
1555 +/* #undef HAVE_STRCASECMP */
1556 +#endif /* _MSC_VER or __DMC__ */
1557 +
1558 +/* Define to 1 if you have the `strerror' function. */
1559 +#define HAVE_STRERROR 1
1560 +
1561 +/* Define to 1 if you have the <strings.h> header file. */
1562 +#if !defined(_MSC_VER) && !defined(__DMC__)
1563 +#define HAVE_STRINGS_H 1
1564 +#else /* _MSC_VER or __DMC__ */
1565 +/* #undef HAVE_STRINGS_H */
1566 +#endif /* _MSC_VER or __DMC__ */
1567 +
1568 +/* Define to 1 if you have the <string.h> header file. */
1569 +#define HAVE_STRING_H 1
1570 +
1571 +/* Have functions strlcpy and strlcat */
1572 +/* #undef HAVE_STRLCPY */
1573 +
1574 +/* Define to 1 if you have the `strncasecmp' function. */
1575 +#if !defined(_MSC_VER) && !defined(__DMC__)
1576 +#define HAVE_STRNCASECMP 1
1577 +#else /* _MSC_VER or __DMC__ */
1578 +/* #undef HAVE_STRNCASECMP */
1579 +#endif /* _MSC_VER or __DMC__ */
1580 +
1581 +/* Define to 1 if you have the `strndup' function. */
1582 +/* #undef HAVE_STRNDUP */
1583 +
1584 +/* Define to 1 if you have the `strsignal' function. */
1585 +/* #undef HAVE_STRSIGNAL */
1586 +
1587 +/* Define to 1 if `f_bavail' is member of `struct statfs'. */
1588 +/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */
1589 +
1590 +/* Define to 1 if `f_fstypename' is member of `struct statfs'. */
1591 +/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
1592 +
1593 +/* Define to 1 if `f_basetype' is member of `struct statvfs'. */
1594 +/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
1595 +
1596 +/* Define to 1 if `st_atimensec' is member of `struct stat'. */
1597 +/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
1598 +
1599 +/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */
1600 +/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */
1601 +
1602 +/* Define to 1 if `st_blksize' is member of `struct stat'. */
1603 +/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
1604 +
1605 +/* Define to 1 if `st_blocks' is member of `struct stat'. */
1606 +/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */
1607 +
1608 +/* Define to 1 if `st_ctimensec' is member of `struct stat'. */
1609 +/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
1610 +
1611 +/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */
1612 +/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */
1613 +
1614 +/* Define to 1 if `st_mtimensec' is member of `struct stat'. */
1615 +/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
1616 +
1617 +/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
1618 +/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
1619 +
1620 +/* Define to 1 if you have the `symlink' function. */
1621 +/* #undef HAVE_SYMLINK */
1622 +
1623 +/* Define to 1 if you have the <sys/inotify.h> header file. */
1624 +/* #undef HAVE_SYS_INOTIFY_H */
1625 +
1626 +/* Define to 1 if you have the <sys/mntctl.h> header file. */
1627 +/* #undef HAVE_SYS_MNTCTL_H */
1628 +
1629 +/* Define to 1 if you have the <sys/mnttab.h> header file. */
1630 +/* #undef HAVE_SYS_MNTTAB_H */
1631 +
1632 +/* Define to 1 if you have the <sys/mount.h> header file. */
1633 +/* #undef HAVE_SYS_MOUNT_H */
1634 +
1635 +/* Define to 1 if you have the <sys/param.h> header file. */
1636 +#if !defined(_MSC_VER) && !defined(__DMC__)
1637 +#define HAVE_SYS_PARAM_H 1
1638 +#else /* _MSC_VER or __DMC__ */
1639 +/* #undef HAVE_SYS_PARAM_H */
1640 +#endif /* _MSC_VER or __DMC__ */
1641 +
1642 +/* Define to 1 if you have the <sys/poll.h> header file. */
1643 +/* #undef HAVE_SYS_POLL_H */
1644 +
1645 +/* Define to 1 if you have the <sys/prctl.h> header file. */
1646 +/* #undef HAVE_SYS_PRCTL_H */
1647 +
1648 +/* Define to 1 if you have the <sys/resource.h> header file. */
1649 +/* #undef HAVE_SYS_RESOURCE_H */
1650 +
1651 +/* found fd_set in sys/select.h */
1652 +/* #undef HAVE_SYS_SELECT_H */
1653 +
1654 +/* Define to 1 if you have the <sys/statfs.h> header file. */
1655 +/* #undef HAVE_SYS_STATFS_H */
1656 +
1657 +/* Define to 1 if you have the <sys/statvfs.h> header file. */
1658 +/* #undef HAVE_SYS_STATVFS_H */
1659 +
1660 +/* Define to 1 if you have the <sys/stat.h> header file. */
1661 +#define HAVE_SYS_STAT_H 1
1662 +
1663 +/* Define to 1 if you have the <sys/sysctl.h> header file. */
1664 +/* #undef HAVE_SYS_SYSCTL_H */
1665 +
1666 +/* Define to 1 if you have the <sys/times.h> header file. */
1667 +/* #undef HAVE_SYS_TIMES_H */
1668 +
1669 +/* Define to 1 if you have the <sys/time.h> header file. */
1670 +#ifndef _MSC_VER
1671 +#define HAVE_SYS_TIME_H 1
1672 +#else /* _MSC_VER */
1673 +/* #undef HAVE_SYS_TIME_H */
1674 +#endif /* _MSC_VER */
1675 +
1676 +/* Define to 1 if you have the <sys/types.h> header file. */
1677 +#define HAVE_SYS_TYPES_H 1
1678 +
1679 +/* Define to 1 if you have the <sys/uio.h> header file. */
1680 +/* #undef HAVE_SYS_UIO_H */
1681 +
1682 +/* Define to 1 if you have the <sys/vfstab.h> header file. */
1683 +/* #undef HAVE_SYS_VFSTAB_H */
1684 +
1685 +/* Define to 1 if you have the <sys/vfs.h> header file. */
1686 +/* #undef HAVE_SYS_VFS_H */
1687 +
1688 +/* Define to 1 if you have the <sys/vmount.h> header file. */
1689 +/* #undef HAVE_SYS_VMOUNT_H */
1690 +
1691 +/* Define to 1 if you have the <sys/wait.h> header file. */
1692 +/* #undef HAVE_SYS_WAIT_H */
1693 +
1694 +/* Define to 1 if you have the <sys/xattr.h> header file. */
1695 +/* #undef HAVE_SYS_XATTR_H */
1696 +
1697 +/* Define to 1 if you have the `timegm' function. */
1698 +/* #undef HAVE_TIMEGM */
1699 +
1700 +/* Define to 1 if you have the <unistd.h> header file. */
1701 +#ifndef _MSC_VER
1702 +#define HAVE_UNISTD_H 1
1703 +#else /* _MSC_VER */
1704 +/* #undef HAVE_UNISTD_H */
1705 +#endif /* _MSC_VER */
1706 +
1707 +/* Define if your printf function family supports positional parameters as
1708 + specified by Unix98. */
1709 +/* #undef HAVE_UNIX98_PRINTF */
1710 +
1711 +/* Define to 1 if you have the `unsetenv' function. */
1712 +/* #undef HAVE_UNSETENV */
1713 +
1714 +/* Define to 1 if you have the `utimes' function. */
1715 +/* #undef HAVE_UTIMES */
1716 +
1717 +/* Define to 1 if you have the `valloc' function. */
1718 +/* #undef HAVE_VALLOC */
1719 +
1720 +/* Define to 1 if you have the <values.h> header file. */
1721 +#if !defined(_MSC_VER) && !defined(__DMC__)
1722 +#define HAVE_VALUES_H 1
1723 +#else /* _MSC_VER or __DMC__ */
1724 +/* #undef HAVE_VALUES_H */
1725 +#endif /* _MSC_VER or __DMC__ */
1726 +
1727 +/* Define to 1 if you have the `vasprintf' function. */
1728 +#define HAVE_VASPRINTF 1
1729 +
1730 +/* Define to 1 if you have the `vprintf' function. */
1731 +#define HAVE_VPRINTF 1
1732 +
1733 +/* Define to 1 if you have the `vsnprintf' function. */
1734 +#ifndef _MSC_VER
1735 +#define HAVE_VSNPRINTF 1
1736 +#ifdef __DMC__
1737 +#define vsnprintf _vsnprintf
1738 +#endif
1739 +#else /* _MSC_VER */
1740 +/* #undef HAVE_VSNPRINTF */
1741 +#endif /* _MSC_VER */
1742 +
1743 +/* Define if you have the 'wchar_t' type. */
1744 +#define HAVE_WCHAR_T 1
1745 +
1746 +/* Define to 1 if you have the `wcslen' function. */
1747 +#define HAVE_WCSLEN 1
1748 +
1749 +/* Define if you have the 'wint_t' type. */
1750 +#define HAVE_WINT_T 1
1751 +
1752 +/* Have a working bcopy */
1753 +/* #undef HAVE_WORKING_BCOPY */
1754 +
1755 +/* Define to 1 if you have the <wspiapi.h> header file. */
1756 +#ifndef _MSC_VER
1757 +/* #undef HAVE_WSPIAPI_H */
1758 +#else
1759 +#define HAVE_WSPIAPI_H 1
1760 +#endif
1761 +
1762 +/* Define to 1 if xattr is available */
1763 +/* #undef HAVE_XATTR */
1764 +
1765 +/* Define to 1 if xattr API uses XATTR_NOFOLLOW */
1766 +/* #undef HAVE_XATTR_NOFOLLOW */
1767 +
1768 +/* Define to 1 if you have the `_NSGetEnviron' function. */
1769 +/* #undef HAVE__NSGETENVIRON */
1770 +
1771 +/* Define to the sub-directory in which libtool stores uninstalled libraries.
1772 + */
1773 +#define LT_OBJDIR ".libs/"
1774 +
1775 +/* Do we cache iconv descriptors */
1776 +#define NEED_ICONV_CACHE 1
1777 +
1778 +/* didn't find fd_set */
1779 +#define NO_FD_SET 1
1780 +
1781 +/* Define to 1 if your C compiler doesn't accept -c and -o together. */
1782 +/* #undef NO_MINUS_C_MINUS_O */
1783 +
1784 +/* global 'sys_errlist' not found */
1785 +#define NO_SYS_ERRLIST 1
1786 +
1787 +/* global 'sys_siglist' not found */
1788 +#define NO_SYS_SIGLIST 1
1789 +
1790 +/* global 'sys_siglist' not declared */
1791 +#define NO_SYS_SIGLIST_DECL 1
1792 +
1793 +/* Define to the address where bug reports for this package should be sent. */
1794 +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib"
1795 +
1796 +/* Define to the full name of this package. */
1797 +#define PACKAGE_NAME "glib"
1798 +
1799 +/* Define to the full name and version of this package. */
1800 +#define PACKAGE_STRING "glib 2.28.1"
1801 +
1802 +/* Define to the one symbol short name of this package. */
1803 +#define PACKAGE_TARNAME "glib"
1804 +
1805 +/* Define to the version of this package. */
1806 +#define PACKAGE_VERSION "2.28.1"
1807 +
1808 +/* Maximum POSIX RT priority */
1809 +/* #undef POSIX_MAX_PRIORITY */
1810 +
1811 +/* define if posix_memalign() can allocate any size */
1812 +/* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
1813 +
1814 +/* Minimum POSIX RT priority */
1815 +/* #undef POSIX_MIN_PRIORITY */
1816 +
1817 +/* The POSIX RT yield function */
1818 +/* #undef POSIX_YIELD_FUNC */
1819 +
1820 +/* whether realloc (NULL,) works */
1821 +#define REALLOC_0_WORKS 1
1822 +
1823 +/* Define if you have correct malloc prototypes */
1824 +#ifndef _MSC_VER
1825 +#define SANE_MALLOC_PROTOS 1
1826 +#else /* _MSC_VER */
1827 +/* #undef SANE_MALLOC_PROTOS */
1828 +#endif /* _MSC_VER */
1829 +
1830 +/* The size of `char', as computed by sizeof. */
1831 +#define SIZEOF_CHAR 1
1832 +
1833 +/* The size of `int', as computed by sizeof. */
1834 +#define SIZEOF_INT 4
1835 +
1836 +/* The size of `long', as computed by sizeof. */
1837 +#define SIZEOF_LONG 4
1838 +
1839 +/* The size of `long long', as computed by sizeof. */
1840 +#ifndef _MSC_VER
1841 +#define SIZEOF_LONG_LONG 8
1842 +#else /* _MSC_VER */
1843 +#define SIZEOF_LONG_LONG 0
1844 +#endif /* _MSC_VER */
1845 +
1846 +/* The size of `short', as computed by sizeof. */
1847 +#define SIZEOF_SHORT 2
1848 +
1849 +/* The size of `size_t', as computed by sizeof. */
1850 +#define SIZEOF_SIZE_T 4
1851 +
1852 +/* The size of `void *', as computed by sizeof. */
1853 +#define SIZEOF_VOID_P 4
1854 +
1855 +/* The size of `__int64', as computed by sizeof. */
1856 +#define SIZEOF___INT64 8
1857 +
1858 +/* If using the C implementation of alloca, define if you know the
1859 + direction of stack growth for your system; otherwise it will be
1860 + automatically deduced at runtime.
1861 + STACK_DIRECTION > 0 => grows toward higher addresses
1862 + STACK_DIRECTION < 0 => grows toward lower addresses
1863 + STACK_DIRECTION = 0 => direction of growth unknown */
1864 +/* #undef STACK_DIRECTION */
1865 +
1866 +/* Number of arguments to statfs() */
1867 +/* #undef STATFS_ARGS */
1868 +
1869 +/* Define to 1 if you have the ANSI C header files. */
1870 +#define STDC_HEADERS 1
1871 +
1872 +/* Using GNU libiconv */
1873 +/* #undef USE_LIBICONV_GNU */
1874 +
1875 +/* Using a native implementation of iconv in a separate library */
1876 +#define USE_LIBICONV_NATIVE 1
1877 +
1878 +/* using the system-supplied PCRE library */
1879 +/* #undef USE_SYSTEM_PCRE */
1880 +
1881 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
1882 + significant byte first (like Motorola and SPARC, unlike Intel). */
1883 +#if defined AC_APPLE_UNIVERSAL_BUILD
1884 +# if defined __BIG_ENDIAN__
1885 +# define WORDS_BIGENDIAN 1
1886 +# endif
1887 +#else
1888 +# ifndef WORDS_BIGENDIAN
1889 +/* # undef WORDS_BIGENDIAN */
1890 +# endif
1891 +#endif
1892 +
1893 +/* Number of bits in a file offset, on hosts where this is settable. */
1894 +/* #undef _FILE_OFFSET_BITS */
1895 +
1896 +/* Define for large files, on AIX-style hosts. */
1897 +/* #undef _LARGE_FILES */
1898 +
1899 +/* Needed to get declarations for msg_control and msg_controllen on Solaris */
1900 +/* #undef _XOPEN_SOURCE */
1901 +
1902 +/* Needed to get declarations for msg_control and msg_controllen on Solaris */
1903 +/* #undef _XOPEN_SOURCE_EXTENDED */
1904 +
1905 +/* Needed to get declarations for msg_control and msg_controllen on Solaris */
1906 +/* #undef __EXTENSIONS__ */
1907 +
1908 +/* Define to empty if `const' does not conform to ANSI C. */
1909 +/* #undef const */
1910 +
1911 +/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
1912 +/* #undef intmax_t */
1913 +
1914 +/* Define to empty if the C compiler doesn't support this keyword. */
1915 +/* #undef signed */
1916 +
1917 +/* Define to `unsigned int' if <sys/types.h> does not define. */
1918 +/* #undef size_t */
1919 +
1920 --- misc/glib-2.28.1/gio/gvdb/makefile.msc Wed Aug 20 14:33:55 2008
1921 +++ misc/build/glib-2.28.1/gio/gvdb/makefile.msc Wed Aug 20 14:26:42 2008
1922 @@ -1 +1,24 @@
1923 -dummy
1924 +TOP = ..\..\..
1925 +
1926 +!INCLUDE ..\..\build\win32\make.msc
1927 +
1928 +INCLUDES = \
1929 + -FImsvc_recommended_pragmas.h \
1930 + -I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \
1931 + $(INTL_CFLAGS) \
1932 + $(SOLARINC)
1933 +
1934 +DEFINES = \
1935 + -DG_LOG_DOMAIN=\"GLib-GIO\" \
1936 + -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
1937 + -DGIO_COMPILATION
1938 +
1939 +OBJECTS = \
1940 + gvdb-reader.obj \
1941 + gvdb-builder.obj
1942 +
1943 +all : giogvdb.lib
1944 +
1945 +giogvdb.lib : $(OBJECTS)
1946 + lib -out:giogvdb.lib $(OBJECTS)
1947 +
1948 --- misc/glib-2.28.1/gio/win32/makefile.msc Wed Aug 20 14:33:55 2008
1949 +++ misc/build/glib-2.28.1/gio/win32/makefile.msc Wed Aug 20 14:26:42 2008
1950 @@ -1 +1,27 @@
1951 -dummy
1952 +TOP = ..\..\..
1953 +
1954 +!INCLUDE ..\..\build\win32\make.msc
1955 +
1956 +INCLUDES = \
1957 + -FImsvc_recommended_pragmas.h \
1958 + -I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \
1959 + $(INTL_CFLAGS) \
1960 + $(SOLARINC)
1961 +
1962 +DEFINES = \
1963 + -DG_LOG_DOMAIN=\"GLib-GIO\" \
1964 + -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
1965 + -DGIO_COMPILATION
1966 +
1967 +OBJECTS = \
1968 + gwin32directorymonitor.obj \
1969 + gwinhttpfile.obj \
1970 + gwinhttpfileinputstream.obj \
1971 + gwinhttpfileoutputstream.obj \
1972 + gwinhttpvfs.obj \
1973 +
1974 +all : giowin32.lib
1975 +
1976 +giowin32.lib : $(OBJECTS)
1977 + lib -out:giowin32.lib $(OBJECTS)
1978 +
1979 --- misc/glib-2.28.1/gobject/gmarshal.c Wed Aug 20 14:33:55 2008
1980 +++ misc/build/glib-2.28.1/gobject/gmarshal.c Wed Aug 20 14:26:42 2008
1981 @@ -1,4 +1,13 @@
1982 +#include "config.h"
1984 +#include "gsourceclosure.h"
1985 +#include "gboxed.h"
1986 +#include "genums.h"
1987 +#include "gmarshal.h"
1988 +#include "gvalue.h"
1989 +#include "gvaluetypes.h"
1990 +#include "gparam.h"
1991 +#include "gobject.h"
1993 #ifdef G_ENABLE_DEBUG
1994 #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)