* 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.
This commit is contained in:
Christopher Faylor 2009-04-05 16:49:15 +00:00
parent 66eaf280ac
commit 50b2715c77
5 changed files with 15 additions and 6 deletions

View File

@ -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> 2009-04-05 Christopher Faylor <me+cygwin@cgf.cx>
* net.cc: Undefine NOERROR and DELETE to avoid compiler warnings. * net.cc: Undefine NOERROR and DELETE to avoid compiler warnings.

View File

@ -430,10 +430,10 @@ globals.h: mkglobals_h globals.cc
${DLL_OFILES}: globals.h ${DLL_OFILES}: globals.h
shared_info_magic.h: cygmagic shared_info.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 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 dcrt0.o sigproc.o: child_info_magic.h

View File

@ -37,7 +37,7 @@ enum child_status
#define EXEC_MAGIC_SIZE sizeof(child_info) #define EXEC_MAGIC_SIZE sizeof(child_info)
/* Change this value if you get a message indicating that it is out-of-sync. */ /* 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 /* NOTE: Do not make gratuitous changes to the names or organization of the
below class. The layout is checksummed to determine compatibility between below class. The layout is checksummed to determine compatibility between

View File

@ -790,10 +790,10 @@ class fhandler_serial: public fhandler_base
}; };
#define acquire_output_mutex(ms) \ #define acquire_output_mutex(ms) \
__acquire_output_mutex (__PRETTY_FUNCTION__, __LINE__, ms); __acquire_output_mutex (__PRETTY_FUNCTION__, __LINE__, ms)
#define release_output_mutex() \ #define release_output_mutex() \
__release_output_mutex (__PRETTY_FUNCTION__, __LINE__); __release_output_mutex (__PRETTY_FUNCTION__, __LINE__)
class tty; class tty;
class tty_min; class tty_min;

View File

@ -31,7 +31,7 @@ public:
#define SHARED_INFO_CB 39328 #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 1 // increment when mount table changes and
#define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION) #define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION)