diff options
| author | Andre Pang <athp@users.sourceforge.net> | 2004-12-12 06:55:58 +0000 |
|---|---|---|
| committer | Andre Pang <athp@users.sourceforge.net> | 2004-12-12 06:55:58 +0000 |
| commit | 1de00c1f9d0f1eba90be53b8dd9635b79b68dc2a (patch) | |
| tree | 057da9b98c78a90e2a4446ab56e413c1479ae5ac /src/libw32dll | |
| parent | f5e91a956b0df782bbdfb23beb319846ca2ebe4f (diff) | |
| download | xine-lib-1de00c1f9d0f1eba90be53b8dd9635b79b68dc2a.tar.gz xine-lib-1de00c1f9d0f1eba90be53b8dd9635b79b68dc2a.tar.bz2 | |
Code cleanups and elimination of some compiler warnings; patch courtesy of AL13N
CVS patchset: 7230
CVS date: 2004/12/12 06:55:58
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/wine/debugtools.h | 10 | ||||
| -rw-r--r-- | src/libw32dll/wine/module.c | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h index ef86580af..038c05309 100644 --- a/src/libw32dll/wine/debugtools.h +++ b/src/libw32dll/wine/debugtools.h @@ -12,13 +12,21 @@ struct _GUID; +#ifndef TRACE #ifdef LOG # define TRACE __vprintf -# define dbg_printf __vprintf #else # define TRACE(...) +#endif +#endif + +#ifndef dbg_printf +#ifdef LOG +# define dbg_printf __vprintf +#else # define dbg_printf(...) #endif +#endif /* Internal definitions (do not use these directly) */ diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c index a1d281cde..2c7ddc454 100644 --- a/src/libw32dll/wine/module.c +++ b/src/libw32dll/wine/module.c @@ -144,8 +144,12 @@ static WIN_BOOL MODULE_InitDll( WINE_MODREF *wm, DWORD type, LPVOID lpReserved ) return TRUE; +#ifdef LOG TRACE("(%s,%s,%p) - CALL\n", wm->modname, typeName[type], lpReserved ); - +#else + TRACE("(%s,%p) - CALL\n", wm->modname, lpReserved ); +#endif + /* Call the initialization routine */ switch ( wm->type ) { @@ -166,8 +170,12 @@ static WIN_BOOL MODULE_InitDll( WINE_MODREF *wm, DWORD type, LPVOID lpReserved ) /* The state of the module list may have changed due to the call to PE_InitDLL. We cannot assume that this module has not been deleted. */ +#ifdef LOG TRACE("(%p,%s,%p) - RETURN %d\n", wm, typeName[type], lpReserved, retv ); - +#else + TRACE("(%p,%p) - RETURN %d\n", wm, lpReserved, retv ); +#endif + return retv; } |