diff --git a/include/audioclient.idl b/include/audioclient.idl index cb1880b466e3cce93aa2d12e55e6d1937eaec079..8050ea6e0121d894e7c9532b3bd4c97febe78252 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audioclient_h__") -cpp_quote("#define __audioclient_h__") - import "wtypes.idl"; import "unknwn.idl"; import "audiosessiontypes.h"; @@ -322,5 +319,3 @@ cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)") cpp_quote("#define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3)") - -cpp_quote("#endif /*__audioclient_h__*/") diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index 53655bc42c8b5fea4e0fb8c0545b4027ea8e9d28..d1832bb523ede09ec3b9b3cc2c0a24f8ea201701 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audiopolicy_h__") -cpp_quote("#define __audiopolicy_h__") - import "oaidl.idl"; import "ocidl.idl"; import "propidl.idl"; @@ -241,5 +238,3 @@ interface IAudioSessionManager2 : IAudioSessionManager [in] IAudioVolumeDuckNotification *duckNotification ); }; - -cpp_quote("#endif /*__audiopolicy_h__*/") diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 18bfa50477c06a778caf81124607dfe74fb12986..c58a5e7c2ab08af01a63e667c32ec62e41a1ba7e 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __devicetopology_h__") -cpp_quote("#define __devicetopology_h__") - interface IPart; interface IControlInterface; interface IDeviceTopology; @@ -737,5 +734,3 @@ library DevTopologyLib interface IDeviceTopology; } } - -cpp_quote("#endif /*__devicetopology_h__*/") diff --git a/include/htmlhelp.h b/include/htmlhelp.h index bd7d708577662eade570eb3a55d1f55bfc81b582..02517656b14700d3086d40d08ae7eb41386db859 100644 --- a/include/htmlhelp.h +++ b/include/htmlhelp.h @@ -435,7 +435,7 @@ typedef enum tagHH_GPROPID { HH_GPROPID_CONTENT_LANGUAGE = 5 } HH_GPROPID; -#ifdef __WIDL_OAIDL_H +#ifdef __oaidl_h__ typedef struct tagHH_GLOBAL_PROPERTY { @@ -443,7 +443,7 @@ typedef struct tagHH_GLOBAL_PROPERTY VARIANT var; } HH_GLOBAL_PROPERTY ; -#endif /* __WIDL_OAIDL_H */ +#endif /* __oaidl_h__ */ #ifdef __cplusplus } diff --git a/tools/widl/header.c b/tools/widl/header.c index 00d6e76caf051219fe9b12a9f898ca0661e8c27e..06c6f1e52a26294d210a57457ba7e900b3aa3bf8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1371,8 +1371,8 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <ole2.h>\n"); fprintf(header, "#endif\n\n"); - fprintf(header, "#ifndef __WIDL_%s\n", header_token); - fprintf(header, "#define __WIDL_%s\n\n", header_token); + fprintf(header, "#ifndef __%s__\n", header_token); + fprintf(header, "#define __%s__\n\n", header_token); fprintf(header, "/* Forward declarations */\n\n"); write_forward_decls(header, stmts); @@ -1394,7 +1394,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "\n"); end_cplusplus_guard(header); - fprintf(header, "#endif /* __WIDL_%s */\n", header_token); + fprintf(header, "#endif /* __%s__ */\n", header_token); fclose(header); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1c9a94b3342496398b9d0ab0cc4ebad1038ddcc6..b0e2b67e8e07de3bb858ea548a81131ab9affd31 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -197,7 +197,7 @@ static char *make_token(const char *name) token = xstrdup(name); for (i=0; token[i]; i++) { if (!isalnum(token[i])) token[i] = '_'; - else token[i] = toupper(token[i]); + else token[i] = tolower(token[i]); } return token; }