diff --git a/Make.rules.in b/Make.rules.in index 77cf55800d843df8cb8e66c59a90e10b08e34d8c..0f9c02a6f5ec2cb10d36a275e1d80cd58c77723b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -143,7 +143,7 @@ filter: dummy $(CC) -c $(ALLCFLAGS) -o $@ $< .c.cross.o: - $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< .y.tab.c: $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< diff --git a/configure.ac b/configure.ac index 7d9031d283b6c9ab9f049dfe12a7ebe74e54f270..f39347ed1c9a8dec3b3ef1bbee0934fd48e7ce9b 100644 --- a/configure.ac +++ b/configure.ac @@ -2160,7 +2160,9 @@ esac dnl **** Generate output files **** -AH_TOP([#define __WINE_CONFIG_H]) +AH_TOP([#ifndef WINE_CROSSTEST +#define __WINE_CONFIG_H]) +AH_BOTTOM([#endif /* WINE_CROSSTEST */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index 29e711c90e09541efff21ec8df9907bb80d21e43..0faf127db6077c1e396ea8f57bbb8443b6d93103 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,5 +1,6 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ +#ifndef WINE_CROSSTEST #define __WINE_CONFIG_H /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ @@ -1307,3 +1308,5 @@ #ifndef __cplusplus #undef inline #endif + +#endif /* WINE_CROSSTEST */