Charles Davis : configure: Use a real header guard for config.h.
Alexandre Julliard
julliard at winehq.org
Thu Aug 15 13:12:47 CDT 2013
Module: wine
Branch: master
Commit: 7fcb736d511084bff60e73e4e803ef3b5590594b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcb736d511084bff60e73e4e803ef3b5590594b
Author: Charles Davis <cdavis5x at gmail.com>
Date: Mon Aug 12 15:07:06 2013 -0600
configure: Use a real header guard for config.h.
---
configure.ac | 8 +++++---
include/config.h.in | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index ca3d038..07ee2f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2527,9 +2527,11 @@ esac
dnl **** Generate output files ****
-AH_TOP([#ifndef WINE_CROSSTEST
-#define __WINE_CONFIG_H])
-AH_BOTTOM([#endif /* WINE_CROSSTEST */])
+AH_TOP([#ifndef __WINE_CONFIG_H
+#define __WINE_CONFIG_H
+#ifndef WINE_CROSSTEST])
+AH_BOTTOM([#endif /* WINE_CROSSTEST */
+#endif /* __WINE_CONFIG_H */])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
diff --git a/include/config.h.in b/include/config.h.in
index e7b1898..014c78a 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -1,7 +1,8 @@
/* include/config.h.in. Generated from configure.ac by autoheader. */
-#ifndef WINE_CROSSTEST
+#ifndef __WINE_CONFIG_H
#define __WINE_CONFIG_H
+#ifndef WINE_CROSSTEST
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
#undef DECLSPEC_HOTPATCH
@@ -1366,3 +1367,4 @@
#endif
#endif /* WINE_CROSSTEST */
+#endif /* __WINE_CONFIG_H */
More information about the wine-cvs
mailing list