Alexandre Julliard : include: Get rid of the DPRINTF() macro.
Module: wine Branch: master Commit: 3d6febc997c808e7c91289c34f7bb48b8b1fe2bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6febc997c808e7c91289c34... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:44 2019 +0200 include: Get rid of the DPRINTF() macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/secur32/schannel_macosx.c | 1 - dlls/windowscodecs/icnsformat.c | 1 - dlls/winecoreaudio.drv/audiounit.c | 2 -- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 1 - dlls/wineqtdecoder/qtdatahandler.c | 2 -- dlls/wineqtdecoder/qtsplitter.c | 2 -- dlls/wineqtdecoder/qtutils.c | 2 -- dlls/wineqtdecoder/qtvdecoder.c | 2 -- dlls/winhttp/session.c | 1 - dlls/wininet/internet.c | 1 - dlls/winspool.drv/info.c | 1 - include/wine/debug.h | 2 -- 15 files changed, 21 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a062335..9d83b00 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -31,7 +31,6 @@ #include <CoreServices/CoreServices.h> #undef LoadResource #undef GetCurrentThread -#undef DPRINTF #endif #include <stdio.h> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 333856e..3e4a876 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -61,7 +61,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 981e4fb..050e8c5 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -30,7 +30,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 02e8ee9..8194bc5 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -75,7 +75,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #define COBJMACROS diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index b49d214..5f20b3d 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -29,8 +29,6 @@ #include <AudioToolbox/AudioToolbox.h> #undef ULONG #undef HRESULT - -#undef DPRINTF #undef STDMETHODCALLTYPE #include "coreaudio.h" #include "wine/debug.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 28ada43..2f4683a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #undef GetCurrentThread #undef GetCurrentProcess #undef _CDECL -#undef DPRINTF #include "windef.h" #include "winbase.h" diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 011b1ff..6165dc5 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -83,7 +83,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #include <pthread.h> diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index c88b354..30b5161 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c0a9b93..d2255b1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index 19ba90c..4c88656 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include "windef.h" diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 9091da1..46a8ac0 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #define COBJMACROS diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f4f7e41..239b86b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -26,7 +26,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6db42d6..b9f9f91 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -34,7 +34,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "winsock2.h" diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 763d244..d7e2211 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -102,7 +102,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #include "wine/library.h" diff --git a/include/wine/debug.h b/include/wine/debug.h index bb72827..6a981d6 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -496,7 +496,6 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch }; \ static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch -#define WINE_DPRINTF wine_dbg_printf #define WINE_MESSAGE wine_dbg_printf #ifdef __WINESRC__ @@ -530,7 +529,6 @@ static inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbg #define ERR_(ch) WINE_ERR_(ch) #define ERR_ON(ch) WINE_ERR_ON(ch) -#define DPRINTF WINE_DPRINTF #define MESSAGE WINE_MESSAGE #endif /* __WINESRC__ */
participants (1)
-
Alexandre Julliard