diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-10-10 03:28:24 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-10-10 03:28:24 +0400 |
| commit | d3fee5eccbdbc3d22aad40f6ddb9d16cd2343588 (patch) | |
| tree | ea05b23ea531baa46d9efc8d9f181140c160472a /winsup/cygwin/dcrt0.cc | |
| parent | 132a3b30b9b67eab414bc185537ab6ed4e9eab4d (diff) | |
* uinfo.cc (internal_getlogin): Reorganize slightly to minimize work in default
condition.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 58f40ce4a..17898b858 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -834,12 +834,7 @@ _dll_crt0 () if (_cygwin_testing) fork_info = NULL; else if ((fork_info->type & PROC_MAGIC_MASK) == PROC_MAGIC_GENERIC) - api_fatal ("\ -You have multiple copies of cygwin1.dll on your system.\n\ -Search for cygwin1.dll using the Windows Start->Find/Search facility\n\ -and delete all but the most recent version. This will probably be\n\ -the one that resides in x:\\cygwin\\bin, where 'x' is the drive on which\n\ -you have installed the cygwin distribution.\n"); + multiple_cygwin_die (); break; } } @@ -1013,6 +1008,17 @@ __api_fatal (const char *fmt, ...) myself->exit (1); } +void +multiple_cygwin_die () +{ + api_fatal ("\ +You have multiple copies of cygwin1.dll on your system.\n\ +Search for cygwin1.dll using the Windows Start->Find/Search facility\n\ +and delete all but the most recent version. This will probably be\n\ +the one that resides in x:\\cygwin\\bin, where 'x' is the drive on which\n\ +you have installed the cygwin distribution.\n"); +} + #ifdef DEBUGGING void __stdcall cygbench (const char *s) |