configure: Don't allow using config.h when cross-compiling.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-05-14 13:57:06 +02:00
parent b8daf1f134
commit ce09e564d7
4 changed files with 7 additions and 8 deletions

View File

@ -2715,9 +2715,10 @@ dnl **** Generate output files ****
AH_TOP([#ifndef __WINE_CONFIG_H
#define __WINE_CONFIG_H
#ifndef WINE_CROSS_PE])
AH_BOTTOM([#endif /* WINE_CROSS_PE */
#endif /* __WINE_CONFIG_H */])
#ifdef WINE_CROSS_PE
#error config.h should not be used when cross-compiling
#endif])
AH_BOTTOM([#endif /* __WINE_CONFIG_H */])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD

View File

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#define COBJMACROS

View File

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"

View File

@ -2,7 +2,9 @@
#ifndef __WINE_CONFIG_H
#define __WINE_CONFIG_H
#ifndef WINE_CROSS_PE
#ifdef WINE_CROSS_PE
#error config.h should not be used when cross-compiling
#endif
/* Define to the file extension for executables. */
#undef EXEEXT
@ -1475,5 +1477,4 @@
#undef inline
#endif
#endif /* WINE_CROSS_PE */
#endif /* __WINE_CONFIG_H */