Module: wine Branch: master Commit: 386fdd81e96a2111c23bd18fb41496d2b8278b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386fdd81e96a2111c23bd18fb4...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Jan 4 17:07:43 2007 +0000
ddraw: Declare some functions static.
---
dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/utils.c | 39 ++++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 8828aad..ca3bc76 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -631,7 +631,6 @@ typedef struct } member_info;
/* Structure copy */ -#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) #define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) }
#define DD_STRUCT_COPY_BYSIZE(to,from) \ diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index bf31780..a80688c 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -30,7 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-void DDRAW_dump_flags_(DWORD flags, const flag_info* names, size_t num_names, int newline);
/***************************************************************************** * PixelFormat_WineD3DtoDD @@ -629,6 +628,25 @@ DDRAW_dump_DDCOLORKEY(const DDCOLORKEY * { DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } + +#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) +static void +DDRAW_dump_flags_(DWORD flags, + const flag_info* names, + size_t num_names, + int newline) +{ + unsigned int i; + + for (i=0; i < num_names; i++) + if ((flags & names[i].val) || /* standard flag value */ + ((!flags) && (!names[i].val))) /* zero value only */ + DPRINTF("%s ", names[i].name); + + if (newline) + DPRINTF("\n"); +} + void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) { static const flag_info flags[] = { @@ -702,23 +720,6 @@ DDRAW_dump_DDSCAPS(const DDSCAPS *in) DDRAW_dump_DDSCAPS2(&in_bis); }
-void -DDRAW_dump_flags_(DWORD flags, - const flag_info* names, - size_t num_names, - int newline) -{ - unsigned int i; - - for (i=0; i < num_names; i++) - if ((flags & names[i].val) || /* standard flag value */ - ((!flags) && (!names[i].val))) /* zero value only */ - DPRINTF("%s ", names[i].name); - - if (newline) - DPRINTF("\n"); -} - static void DDRAW_dump_pixelformat_flag(DWORD flagmask) { @@ -743,7 +744,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagma DDRAW_dump_flags_(flagmask, flags, sizeof(flags)/sizeof(flags[0]), 0); }
-void +static void DDRAW_dump_members(DWORD flags, const void* data, const member_info* mems,