diff loader/wine/debugtools.h @ 25794:2c8cdb9123b8

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.

--- a/loader/wine/debugtools.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/debugtools.h	Sun Jan 20 17:16:39 2008 +0000
@@ -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_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 );