From 3bbe897e247d128cf63f1fad665fdfc086bab5ab Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 20 Jan 2008 17:16:39 +0000 Subject: Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a capital letter are reserved for the system, those starting with _ are reserved at the file level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/wine/debugtools.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'loader/wine/debugtools.h') diff --git a/loader/wine/debugtools.h b/loader/wine/debugtools.h index d9ab591412..3afee5c3eb 100644 --- a/loader/wine/debugtools.h +++ b/loader/wine/debugtools.h @@ -6,39 +6,40 @@ #include "config.h" #include "windef.h" -struct _GUID; +struct GUID; /* Internal definitions (do not use these directly) */ -enum __DEBUG_CLASS { __DBCL_FIXME, __DBCL_ERR, __DBCL_WARN, __DBCL_TRACE, __DBCL_COUNT }; +enum DEBUG_CLASS { DBCL_FIXME, DBCL_ERR, DBCL_WARN, DBCL_TRACE, DBCL_COUNT }; #ifndef NO_TRACE_MSGS -# define __GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << __DBCL_TRACE)) +# define GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << DBCL_TRACE)) #else -# define __GET_DEBUGGING_trace(dbch) 0 +# define GET_DEBUGGING_trace(dbch) 0 #endif #ifndef NO_DEBUG_MSGS -# define __GET_DEBUGGING_warn(dbch) ((dbch)[0] & (1 << __DBCL_WARN)) -# define __GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << __DBCL_FIXME)) +# define GET_DEBUGGING_warn(dbch) ((dbch)[0] & (1 << DBCL_WARN)) +# define GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << DBCL_FIXME)) #else -# define __GET_DEBUGGING_warn(dbch) 0 -# define __GET_DEBUGGING_fixme(dbch) 0 +# define GET_DEBUGGING_warn(dbch) 0 +# define GET_DEBUGGING_fixme(dbch) 0 #endif /* define error macro regardless of what is configured */ -#define __GET_DEBUGGING_err(dbch) ((dbch)[0] & (1 << __DBCL_ERR)) +#define GET_DEBUGGING_err(dbch) ((dbch)[0] & (1 << DBCL_ERR)) -#define __GET_DEBUGGING(dbcl,dbch) __GET_DEBUGGING_##dbcl(dbch) -#define __SET_DEBUGGING(dbcl,dbch,on) \ +#define GET_DEBUGGING(dbcl,dbch) GET_DEBUGGING_##dbcl(dbch) +#define SET_DEBUGGING(dbcl,dbch,on) \ ((on) ? ((dbch)[0] |= 1 << (dbcl)) : ((dbch)[0] &= ~(1 << (dbcl)))) #ifndef __GNUC__ #define __FUNCTION__ "" #endif -#define __DPRINTF(dbcl,dbch) \ - (!__GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \ +// illegal identifier +#define DPRINTF__(dbcl,dbch) \ + (!GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \ (void)0 : (void)dbg_printf /* Exported definitions and macros */ @@ -50,7 +51,7 @@ extern LPCSTR debugstr_an (LPCSTR s, int n); extern LPCSTR debugstr_wn (LPCWSTR s, int n); extern LPCSTR debugres_a (LPCSTR res); extern LPCSTR debugres_w (LPCWSTR res); -extern LPCSTR debugstr_guid( const struct _GUID *id ); +extern LPCSTR debugstr_guid( const struct GUID *id ); extern LPCSTR debugstr_hex_dump (const void *ptr, int len); extern int dbg_header_err( const char *dbg_channel, const char *func ); extern int dbg_header_warn( const char *dbg_channel, const char *func ); -- cgit v1.2.3