Commit ce09e564 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent b8daf1f1
...@@ -2715,9 +2715,10 @@ dnl **** Generate output files **** ...@@ -2715,9 +2715,10 @@ dnl **** Generate output files ****
AH_TOP([#ifndef __WINE_CONFIG_H AH_TOP([#ifndef __WINE_CONFIG_H
#define __WINE_CONFIG_H #define __WINE_CONFIG_H
#ifndef WINE_CROSS_PE]) #ifdef WINE_CROSS_PE
AH_BOTTOM([#endif /* WINE_CROSS_PE */ #error config.h should not be used when cross-compiling
#endif /* __WINE_CONFIG_H */]) #endif])
AH_BOTTOM([#endif /* __WINE_CONFIG_H */])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
#ifndef __WINE_CONFIG_H #ifndef __WINE_CONFIG_H
#define __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. */ /* Define to the file extension for executables. */
#undef EXEEXT #undef EXEEXT
...@@ -1475,5 +1477,4 @@ ...@@ -1475,5 +1477,4 @@
#undef inline #undef inline
#endif #endif
#endif /* WINE_CROSS_PE */
#endif /* __WINE_CONFIG_H */ #endif /* __WINE_CONFIG_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment