Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD/LONG/ULONG from long to int.

2006-09-29 01:18:18 +02:00 · 2006-09-29 01:18:18 +02:00 · 85ce5117c5
parent 3d812659e8
commit 85ce5117c5
193 changed files with 193 additions and 32 deletions
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = activeds.dll
 IMPORTLIB = libactiveds.$(IMPLIBEXT)
 IMPORTS   = kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = activeds_main.c

--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_ADVAPI32_
+EXTRADEFS = -D_ADVAPI32_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = advapi32.dll
 IMPORTS   = ole32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	crypt.c \
--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = advpack.dll
 IMPORTLIB = libadvpack.$(IMPLIBEXT)
 IMPORTS   = setupapi version user32 advapi32 kernel32 ntdll
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	advpack.c \
--- a/dlls/advpack/tests/Makefile.in
+++ b/dlls/advpack/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = advpack.dll
 IMPORTS   = cabinet user32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	advpack.c \
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = amstream.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	amstream.c \
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@ -6,6 +6,7 @@ MODULE    = atl.dll
 IMPORTLIB = libatl.$(IMPLIBEXT)
 IMPORTS   = ole32 shlwapi user32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	atl_main.c \
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@ -6,6 +6,7 @@ MODULE    = avifil32.dll
 IMPORTLIB = libavifil32.$(IMPLIBEXT)
 IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	acmstream.c \
--- a/dlls/cabinet/tests/Makefile.in
+++ b/dlls/cabinet/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = cabinet.dll
 IMPORTS   = cabinet user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
       extract.c
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = cards.dll
 IMPORTLIB = libcards.$(IMPLIBEXT)
 IMPORTS   = user32 gdi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	cards.c
--- a/dlls/cfgmgr32/Makefile.in
+++ b/dlls/cfgmgr32/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = cfgmgr32.dll
 IMPORTLIB = libcfgmgr32.$(IMPLIBEXT)
 IMPORTS   = setupapi kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	main.c
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comcat.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	comcat_main.c \
--- a/dlls/comcat/tests/Makefile.in
+++ b/dlls/comcat/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = comcat.dll
 IMPORTS   = ole32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	comcat.c
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_COMCTL32_
+EXTRADEFS = -D_COMCTL32_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comctl32.dll
 IMPORTS   = comctl32 ole32 shlwapi user32 gdi32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	comboex.c \
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@ -7,6 +7,7 @@ IMPORTLIB = libcomdlg32.$(IMPLIBEXT)
 IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = ole32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	cdlg32.c \
--- a/dlls/comdlg32/tests/Makefile.in
+++ b/dlls/comdlg32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comdlg32.dll
 IMPORTS   = comdlg32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	printdlg.c
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_CRYPT32_
+EXTRADEFS = -D_CRYPT32_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/crypt32/tests/Makefile.in
+++ b/dlls/crypt32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = crypt32.dll
 IMPORTS   = crypt32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	base64.c \
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@ -6,6 +6,7 @@ MODULE    = d3d8.dll
 IMPORTLIB = libd3d8.$(IMPLIBEXT)
 IMPORTS   = wined3d user32 gdi32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	basetexture.c \
--- a/dlls/d3d8/tests/Makefile.in
+++ b/dlls/d3d8/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = d3d8.dll
 IMPORTS   = user32 kernel32
 EXTRALIBS = -ldxerr8
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	d3d8_main.c \
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@ -6,6 +6,7 @@ MODULE    = d3d9.dll
 IMPORTLIB = libd3d9.$(IMPLIBEXT)
 IMPORTS   = wined3d user32 gdi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	basetexture.c \
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = d3d9.dll
 IMPORTS   = user32 kernel32
 EXTRALIBS = -ldxerr9 -luuid -ldxguid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	device.c \
--- a/dlls/d3dx8/Makefile.in
+++ b/dlls/d3dx8/Makefile.in
@ -6,6 +6,7 @@ MODULE    = d3dx8.dll
 IMPORTLIB = libd3dx8.$(IMPLIBEXT)
 IMPORTS   = d3d8 user32 gdi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	d3dx8_main.c \
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@ -6,6 +6,7 @@ MODULE    = d3dxof.dll
 IMPORTLIB = libd3dxof.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	main.c \
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dbghelp.dll
 IMPORTLIB = libdbghelp.$(IMPLIBEXT)
 IMPORTS   = psapi kernel32 ntdll
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	coff.c \
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@ -7,6 +7,7 @@ IMPORTLIB = libddraw.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ 
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	clipper.c \
--- a/dlls/ddraw/tests/Makefile.in
+++ b/dlls/ddraw/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = ddraw.dll
 IMPORTS   = ddraw user32 gdi32 kernel32
 EXTRALIBS = -ldxguid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	d3d.c \
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = devenum.dll
 IMPORTS   = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	createdevenum.c \
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@ -6,6 +6,7 @@ MODULE    = dinput.dll
 IMPORTLIB = libdinput.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	data_formats.c \
--- a/dlls/dinput/tests/Makefile.in
+++ b/dlls/dinput/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = dinput.dll
 IMPORTS   = dinput ole32 version user32 kernel32
 EXTRALIBS = -ldxguid -luuid -ldxerr8
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	joystick.c \
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@ -6,6 +6,7 @@ MODULE    = dinput8.dll
 IMPORTLIB = libdinput8.$(IMPLIBEXT)
 IMPORTS   = dinput ole32 advapi32 kernel32
 EXTRALIBS = -luuid -ldxguid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dinput8_main.c
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmband.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	band.c \
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmcompos.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	chordmap.c \
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmime.dll
 IMPORTS   = dsound winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	audiopath.c \
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmloader.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	classfactory.c \
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmscript.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dmscript_main.c \
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmstyle.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	auditiontrack.c \
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmsynth.dll
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dmsynth_main.c \
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dmusic.dll
 IMPORTS   = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	buffer.c \
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@ -6,6 +6,7 @@ MODULE    = dnsapi.dll
 IMPORTLIB = libdnsapi.$(IMPLIBEXT)
 IMPORTS   = netapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	main.c \
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@ -6,6 +6,7 @@ MODULE    = dpnet.dll
 IMPORTLIB = libdpnet.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	address.c \
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@ -6,6 +6,7 @@ MODULE    = dsound.dll
 IMPORTLIB = libdsound.$(IMPLIBEXT)
 IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	buffer.c \
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = dsound.dll
 IMPORTS   = dsound ole32 version user32 kernel32
 EXTRALIBS = -ldxguid -luuid -ldxerr8
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	capture.c \
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dswave.dll
 IMPORTS   = msacm32 ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dswave.c \
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = dxdiagn.dll
 IMPORTS   = version ole32 oleaut32 user32 advapi32 kernel32
 EXTRALIBS = -lstrmiids -ldxguid -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	container.c \
--- a/dlls/dxerr8/Makefile.in
+++ b/dlls/dxerr8/Makefile.in
@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = libdxerr8.a
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dxerr8.c
--- a/dlls/dxerr9/Makefile.in
+++ b/dlls/dxerr9/Makefile.in
@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = libdxerr9.a
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dxerr9.c
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_GDI32_
+EXTRADEFS = -D_GDI32_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/gdi/tests/Makefile.in
+++ b/dlls/gdi/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = gdi32.dll
 IMPORTS   = user32 gdi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	bitmap.c \
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = hhctrl.ocx
 IMPORTS   = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	chm.c \
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@ -7,6 +7,7 @@ IMPORTS   = shell32 ole32 advapi32 kernel32
 IMPORTLIB = libhlink.$(IMPLIBEXT)
 DELAYIMPORTS = urlmon
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	browse_ctx.c \
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = iccvid.dll
 IMPORTS   = user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	iccvid.c
--- a/dlls/ifsmgr.vxd/Makefile.in
+++ b/dlls/ifsmgr.vxd/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ifsmgr.vxd
 IMPORTS   = winedos kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	ifsmgr.c
--- a/dlls/imaadp32.acm/Makefile.in
+++ b/dlls/imaadp32.acm/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imaadp32.acm
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = imaadp32.c

--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = imm32.dll
 IMPORTLIB = libimm32.$(IMPLIBEXT)
 IMPORTS   = user32 gdi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	imm.c
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = infosoft.dll
 IMPORTS   = ole32 advapi32 kernel32 ntdll
 EXTRALIBS = -luuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	infosoft_main.c \
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@ -6,6 +6,7 @@ MODULE    = iphlpapi.dll
 IMPORTLIB = libiphlpapi.$(IMPLIBEXT)
 IMPORTS   = advapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	ifenum.c \
--- a/dlls/iphlpapi/tests/Makefile.in
+++ b/dlls/iphlpapi/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = iphlpapi.dll
 IMPORTS   = iphlpapi kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	iphlpapi.c
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = itss.dll
 IMPORTS   = ole32 user32 advapi32 kernel32 ntdll
 EXTRALIBS = -luuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	chm_lib.c \
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_KERNEL32_
+EXTRADEFS = -D_KERNEL32_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/kernel32/tests/Makefile.in
+++ b/dlls/kernel32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = kernel32.dll
 IMPORTS   = kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	alloc.c \
--- a/dlls/localspl/tests/Makefile.in
+++ b/dlls/localspl/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = localspl.dll
 IMPORTS   = kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	localmon.c
--- a/dlls/lz32/tests/Makefile.in
+++ b/dlls/lz32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = lz32.dll
 IMPORTS   = lz32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	lzexpand_main.c
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@ -6,6 +6,7 @@ MODULE    = mapi32.dll
 IMPORTLIB = libmapi32.$(IMPLIBEXT)
 IMPORTS   = shlwapi shell32 ole32 user32 kernel32 ntdll
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	imalloc.c \
--- a/dlls/mapi32/tests/Makefile.in
+++ b/dlls/mapi32/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = mapi32.dll
 IMPORTS   = kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	imalloc.c \
--- a/dlls/mciavi32/Makefile.in
+++ b/dlls/mciavi32/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi32.dll
 IMPORTS   = msvfw32 winmm user32 gdi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	info.c \
--- a/dlls/mcicda/Makefile.in
+++ b/dlls/mcicda/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.dll
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	mcicda.c
--- a/dlls/mciseq/Makefile.in
+++ b/dlls/mciseq/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.dll
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	mcimidi.c
--- a/dlls/mciwave/Makefile.in
+++ b/dlls/mciwave/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.dll
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	mciwave.c
--- a/dlls/midimap/Makefile.in
+++ b/dlls/midimap/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.dll
 IMPORTS   = winmm user32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	midimap.c
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@ -6,7 +6,7 @@ MODULE    = mlang.dll
 IMPORTLIB = libmlang.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
 EXTRALIBS = -luuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	mlang.c \
--- a/dlls/mlang/tests/Makefile.in
+++ b/dlls/mlang/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = mlang.dll
 IMPORTS   = ole32 gdi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	mlang.c
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = mpr.dll
 IMPORTLIB = libmpr.$(IMPLIBEXT)
 IMPORTS   = user32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	auth.c \
--- a/dlls/msacm32.drv/Makefile.in
+++ b/dlls/msacm32.drv/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.drv
 IMPORTS   = msacm32 winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	wavemap.c
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msacm32.dll
 IMPORTLIB = libmsacm32.$(IMPLIBEXT)
 IMPORTS   = winmm user32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	driver.c \
--- a/dlls/msacm32/tests/Makefile.in
+++ b/dlls/msacm32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msacm32.dll
 IMPORTS   = msacm32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	msacm.c
--- a/dlls/msadp32.acm/Makefile.in
+++ b/dlls/msadp32.acm/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msadp32.acm
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = msadp32.c

--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@ -6,6 +6,7 @@ MODULE    = mscms.dll
 IMPORTLIB = libmscms.$(IMPLIBEXT)
 IMPORTS   = kernel32 ntdll
 EXTRALIBS = @LCMSLIBS@
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	handle.c \
--- a/dlls/mscms/tests/Makefile.in
+++ b/dlls/mscms/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mscms.dll
 IMPORTS   = advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	profile.c
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@ -6,6 +6,7 @@ MODULE    = msdmo.dll
 IMPORTLIB = libmsdmo.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32 
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	dmoreg.c \
--- a/dlls/msg711.acm/Makefile.in
+++ b/dlls/msg711.acm/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msg711.acm
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = msg711.c

--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@ -6,7 +6,7 @@ MODULE    = mshtml.dll
 IMPORTLIB = libmshtml.$(IMPLIBEXT)
 IMPORTS   = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32 ntdll
 EXTRALIBS = -lstrmiids -luuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	conpoint.c \
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = mshtml.dll
 IMPORTS   = ole32 user32 urlmon advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	htmldoc.c \
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@ -6,6 +6,7 @@ MODULE    = msi.dll
 IMPORTLIB = libmsi.$(IMPLIBEXT)
 IMPORTS   = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	action.c \
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msi.dll
 IMPORTS   = cabinet msi ole32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	db.c \
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msrle32.dll
 IMPORTS   = winmm user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = msrle32.c

--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_MT
+EXTRADEFS = -D_MT -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@ -6,6 +6,7 @@ TESTDLL   = msvcrt.dll
 IMPORTS   = msvcrt kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/..
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	cpp.c \
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msvfw32.dll
 IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
 IMPORTS   = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	mciwnd.c \
--- a/dlls/msvidc32/Makefile.in
+++ b/dlls/msvidc32/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvidc32.dll
 IMPORTS   = user32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	msvideo1.c
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H
+EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/msxml3/tests/Makefile.in
+++ b/dlls/msxml3/tests/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 TESTDLL   = msxml3.dll
 IMPORTS   = oleaut32 ole32 kernel32
 EXTRALIBS = -luuid
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	domdoc.c
--- a/dlls/nddeapi/Makefile.in
+++ b/dlls/nddeapi/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = nddeapi.dll
 IMPORTLIB = libnddeapi.$(IMPLIBEXT)
 IMPORTS   = kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = \
 	nddeapi.c
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_SVRAPI_
+EXTRADEFS = -D_SVRAPI_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/dlls/netapi32/tests/Makefile.in
+++ b/dlls/netapi32/tests/Makefile.in
@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = netapi32.dll
 IMPORTS   = netapi32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 CTESTS = \
 	access.c \
--- a/dlls/newdev/Makefile.in
+++ b/dlls/newdev/Makefile.in
@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = newdev.dll
 IMPORTLIB = libnewdev.$(IMPLIBEXT)
 IMPORTS   = kernel32
+EXTRADEFS = -DWINE_NO_LONG_AS_INT

 C_SRCS = main.c

--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_NTSYSTEM_
+EXTRADEFS = -D_NTSYSTEM_ -DWINE_NO_LONG_AS_INT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
--- a/Show More
+++ b/Show More