From 6d8bd861e2503d0ab3c3cb64016b50700236265b Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 27 Aug 2002 04:10:54 +0000 Subject: * child_info.h: Add _PROC_WHOOPS enum value. (CURR_CHILD_INFO_MAGIC): Update. (child_info::magic): Make 'long'. * cygheap.h: Export _cygheap_start. * cygheap.cc: Don't declare _cygheap_start. * cygmagic: Use cksum to produce checksums. Append 'U' to end of checksum. * dcrt0.cc (initial_env): Calculate sleep ms before reusing buffer. (_dll_crt0): Detect cygheap mismatch as indicative of different cygwin version. Set child_proc_info to NULL when _PROC_WHOOPS. (multiple_cygwin_problem): If child_info specific problem, then set child_proc_info type to _PROC_WHOOPS. * shared_info.h (CURR_MOUNT_MAGIC): Update. (CURR_SHARED_MAGIC): Ditto. --- winsup/cygwin/cygmagic | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/cygmagic') diff --git a/winsup/cygwin/cygmagic b/winsup/cygwin/cygmagic index 387593878..a8ccc8c76 100755 --- a/winsup/cygwin/cygmagic +++ b/winsup/cygwin/cygmagic @@ -17,16 +17,14 @@ cat < $file_magic /* autogenerated - do not edit */ #include "$file" EOF -if sum -r /dev/null >/dev/null 2>&1; then - sumit(){ sum -r $*; } -else - sumit(){ sum $*; } -fi +sumit() { + cksum $* +} while [ -n "$1" ]; do define=$1; shift struct=$1; shift - sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | awk '{printf "0x%x", $1}'` + sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | awk '{printf "0x%xU", $1}'` echo "#define $define $sum" curr=`sed -n "s/^#[ ]*define CURR_$define[ ][ ]*\([^ ][^ ]*\)/\1/p" $file` [ "$curr" != "$sum" ] && echo "*** WARNING WARNING WARNING WARNING WARNING *** -- cgit v1.2.3