* shared.cc (shared_info::initialize): Improve error message clarity.
* mkvers.sh: Eliminate debugging output.
This commit is contained in:
parent
b19f72a2db
commit
92b3b0a6ad
|
@ -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>
|
Thu Jun 22 17:50:59 2000 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* Makefile.in: Autogenerate cygwin.def when appropriate.
|
* Makefile.in: Autogenerate cygwin.def when appropriate.
|
||||||
|
|
|
@ -172,5 +172,4 @@ fi
|
||||||
|
|
||||||
echo "Version $cygwin_ver"
|
echo "Version $cygwin_ver"
|
||||||
set -$- $builddate
|
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
|
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
|
||||||
|
|
|
@ -109,7 +109,10 @@ shared_info::initialize ()
|
||||||
if (inited)
|
if (inited)
|
||||||
{
|
{
|
||||||
if (inited != SHAREDVER)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue