From 50b2715c77e045ee5df136b6bdcd4f9d0c3fb6f2 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 5 Apr 2009 16:49:15 +0000
Subject: [PATCH] * Makefile.in: Use all compile options when calculating magic
 values. * shared_info.h (CURR_SHARED_MAGIC): Revert erroneous value. *
 child_info.h (CURR_CHILD_INFO_MAGIC): Update. * fhandler.h
 (acquire_output_mutex): Remove unneeded ';'. (release_output_mutex): Ditto.

---
 winsup/cygwin/ChangeLog     | 9 +++++++++
 winsup/cygwin/Makefile.in   | 4 ++--
 winsup/cygwin/child_info.h  | 2 +-
 winsup/cygwin/fhandler.h    | 4 ++--
 winsup/cygwin/shared_info.h | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e05d959fc..02e063b7d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-05  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in: Use all compile options when calculating magic values.
+	* shared_info.h (CURR_SHARED_MAGIC): Revert erroneous value.
+	* child_info.h (CURR_CHILD_INFO_MAGIC): Update.
+
+	* fhandler.h (acquire_output_mutex): Remove unneeded ';'.
+	(release_output_mutex): Ditto.
+
 2009-04-05  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* net.cc: Undefine NOERROR and DELETE to avoid compiler warnings.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index f5e1784e0..d9c3b87cc 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -430,10 +430,10 @@ globals.h: mkglobals_h globals.cc
 ${DLL_OFILES}: globals.h
 
 shared_info_magic.h: cygmagic shared_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
+	/bin/sh $(word 1,$^) $@ "${COMPILE_CXX} -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
 
 child_info_magic.h: cygmagic child_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
+	/bin/sh $(word 1,$^) $@ "${COMPILE_CXX} -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
 
 dcrt0.o sigproc.o: child_info_magic.h
 
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h
index 56858e709..44767edc9 100644
--- a/winsup/cygwin/child_info.h
+++ b/winsup/cygwin/child_info.h
@@ -37,7 +37,7 @@ enum child_status
 #define EXEC_MAGIC_SIZE sizeof(child_info)
 
 /* Change this value if you get a message indicating that it is out-of-sync. */
-#define CURR_CHILD_INFO_MAGIC 0x7901d74eU
+#define CURR_CHILD_INFO_MAGIC 0xe850717aU
 
 /* NOTE: Do not make gratuitous changes to the names or organization of the
    below class.  The layout is checksummed to determine compatibility between
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 58ca21476..7dff68dd4 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -790,10 +790,10 @@ class fhandler_serial: public fhandler_base
 };
 
 #define acquire_output_mutex(ms) \
-  __acquire_output_mutex (__PRETTY_FUNCTION__, __LINE__, ms);
+  __acquire_output_mutex (__PRETTY_FUNCTION__, __LINE__, ms)
 
 #define release_output_mutex() \
-  __release_output_mutex (__PRETTY_FUNCTION__, __LINE__);
+  __release_output_mutex (__PRETTY_FUNCTION__, __LINE__)
 
 class tty;
 class tty_min;
diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h
index bf4be4e2b..e332829df 100644
--- a/winsup/cygwin/shared_info.h
+++ b/winsup/cygwin/shared_info.h
@@ -31,7 +31,7 @@ public:
 
 #define SHARED_INFO_CB 39328
 
-#define CURR_SHARED_MAGIC 0x398d8baU
+#define CURR_SHARED_MAGIC 0x22f9ff0bU
 
 #define USER_VERSION	1	// increment when mount table changes and
 #define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION)