Module: wine Branch: master Commit: 718adc91fcfb2c288be7d9f337aad62fa0acb9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718adc91fcfb2c288be7d9f337...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Mar 8 14:52:21 2012 +0100
widl: Make headers guards compatible with midl.
---
include/audioclient.idl | 5 ----- include/audiopolicy.idl | 5 ----- include/devicetopology.idl | 5 ----- include/htmlhelp.h | 4 ++-- tools/widl/header.c | 6 +++--- tools/widl/widl.c | 2 +- 6 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/include/audioclient.idl b/include/audioclient.idl index cb1880b..8050ea6 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 53655bc..d1832bb 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 18bfa50..c58a5e7 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 bd7d708..0251765 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 00d6e76..06c6f1e 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 1c9a94b..b0e2b67 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; }