diff options
author | Christopher Faylor <me@cgf.cx> | 2005-01-05 21:40:08 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-01-05 21:40:08 +0000 |
commit | 2d76a612d2c2ae867f5611da16ebb50f7d059248 (patch) | |
tree | 5b96403671c42db3db8c7854cd1d873c4aa1f0c3 /winsup/cygwin/shared.cc | |
parent | abb13199ba156583bdb1a68f132c1052af6ff096 (diff) | |
download | newlib-2d76a612d2c2ae867f5611da16ebb50f7d059248.zip newlib-2d76a612d2c2ae867f5611da16ebb50f7d059248.tar.gz newlib-2d76a612d2c2ae867f5611da16ebb50f7d059248.tar.bz2 |
* dcrt0.cc (multiple_cygwin_problem): Reorganize error message to not always
talk about a "version" when it's not a version.
(dll_crt0_0): Change info passed to multiple_cygwin_problem to be a little more
precise.
* shared.cc (user_shared_initialize): Ditto.
(shared_info::initialize): Ditto.
Diffstat (limited to 'winsup/cygwin/shared.cc')
-rw-r--r-- | winsup/cygwin/shared.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 640d042..6ef11c3 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -185,9 +185,9 @@ user_shared_initialize (bool reinit) user_shared->delqueue.init (); } else if (user_shared->version != USER_VERSION_MAGIC) - multiple_cygwin_problem ("user", user_shared->version, USER_VERSION_MAGIC); + multiple_cygwin_problem ("user shared memory version", user_shared->version, USER_VERSION_MAGIC); else if (user_shared->cb != sizeof (*user_shared)) - multiple_cygwin_problem ("user shared size", user_shared->cb, sizeof (*user_shared)); + multiple_cygwin_problem ("user shared memory size", user_shared->cb, sizeof (*user_shared)); } void @@ -203,7 +203,7 @@ shared_info::initialize () { if (version != SHARED_VERSION_MAGIC) { - multiple_cygwin_problem ("shared", version, SHARED_VERSION_MAGIC); + multiple_cygwin_problem ("system shared memory version", version, SHARED_VERSION_MAGIC); InterlockedExchange ((LONG *) &version, sversion); } while (!cb) |