diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rwxr-xr-x | winsup/cygwin/mkvers.sh | 1 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f9cb8912a..41818fcad 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 24 12:29:59 2000 Christopher Faylor <cgf@cygnus.com> + + * shared.cc (shared_info::initialize): Improve error message clarity. + * mkvers.sh: Eliminate debugging output. + Thu Jun 22 17:50:59 2000 Christopher Faylor <cgf@cygnus.com> * Makefile.in: Autogenerate cygwin.def when appropriate. diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh index da9688a51..84cb87d31 100755 --- a/winsup/cygwin/mkvers.sh +++ b/winsup/cygwin/mkvers.sh @@ -172,5 +172,4 @@ fi echo "Version $cygwin_ver" set -$- $builddate -set -x exec $windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index f153cfe19..1b6978a62 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -109,7 +109,10 @@ shared_info::initialize () if (inited) { if (inited != SHAREDVER) - api_fatal ("shared region is corrupted. inited %x", inited); + api_fatal ("Shared region version mismatch. Version %x != %x.\n" + "Are you using multiple versions of cygwin1.dll?\n" + "Run 'cygcheck -r -s -v' to find out.", + inited, SHAREDVER); return; } |