Rob Shearman : msvcmaker: Remove the defining of __ASM_SHORT and __ASM_STRING in the generated config .h file.
Alexandre Julliard
julliard at winehq.org
Tue Sep 30 11:15:30 CDT 2008
Module: wine
Branch: master
Commit: 1ab076626d18d63fe293ae45ea3f96fa894c7454
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab076626d18d63fe293ae45ea3f96fa894c7454
Author: Rob Shearman <robertshearman at gmail.com>
Date: Thu Sep 25 16:43:42 2008 +0100
msvcmaker: Remove the defining of __ASM_SHORT and __ASM_STRING in the generated config.h file.
These defines aren't needed. Move the X_DISPLAY_MISSING and __ASM_*
defines to after the PACKAGE_* defines to match config.h.in.
---
tools/winapi/msvcmaker | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index fdf744a..2681117 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -1157,25 +1157,6 @@ sub _generate_config_h($) {
print OUT "\n";
}
- print OUT "#define X_DISPLAY_MISSING 1\n";
- print OUT "\n";
-
- print OUT "/* Define to a macro to generate an assembly function directive */\n";
- print OUT "#define __ASM_FUNC(name) \"\"\n";
- print OUT "\n";
-
- print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n";
- print OUT "#define __ASM_NAME(name) name\n";
- print OUT "\n";
-
- print OUT "/* Define to the assembler keyword used to specify a word value */\n";
- print OUT "#define __ASM_SHORT \".short\"\n";
- print OUT "\n";
-
- print OUT "/* Define to the assembler keyword used to specify an ASCII string */\n";
- print OUT "#define __ASM_STRING \".string\"\n";
- print OUT "\n";
-
print OUT "/* Define to the address where bug reports for this package should be sent. */\n";
print OUT "#define PACKAGE_BUGREPORT \"\"\n";
print OUT "\n";
@@ -1196,5 +1177,16 @@ sub _generate_config_h($) {
print OUT "#define PACKAGE_VERSION \"YYYYMMDD\"\n";
print OUT "\n";
+ print OUT "#define X_DISPLAY_MISSING 1\n";
+ print OUT "\n";
+
+ print OUT "/* Define to a macro to generate an assembly function directive */\n";
+ print OUT "#define __ASM_FUNC(name) \"\"\n";
+ print OUT "\n";
+
+ print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n";
+ print OUT "#define __ASM_NAME(name) name\n";
+ print OUT "\n";
+
close(OUT);
}
More information about the wine-cvs
mailing list