diff options
| author | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-06-19 01:16:15 +0400 |
|---|---|---|
| committer | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-06-19 01:16:15 +0400 |
| commit | 06e7174d6e433451c8b41491038cee1fe2dcc268 (patch) | |
| tree | 1069c222a666169ceb946696d822d247961058de /winsup/cygserver | |
| parent | 082b6fda742bfef9bb3a8137e58e17f916069cf4 (diff) | |
* woutsup.h (cygserver_running): Add declaration.
(api_fatal): Eliminate.
* include/cygwin/cygserver.h
(client_request_get_version::check_version): Change return type to
bool.
(check_cygserver_available): New function.
(cygserver_init): Add check_version_too argument.
* cygserver_client.cc (allow_daemon): Make a bool.
(client_request_get_version::make_request): See errno on error.
Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now
handled in cygserver_init().
(client_request_get_version::check_version): Use syscall_printf()
instead of api_fatal(). Return true if cygserver version is
compatible.
(check_cygserver_available): New function; code moved here from
cygserver_init().
(cygserver_init): Move some code into check_cygserver_available().
* cygserver.cc (__set_errno): Copy from debug.cc so that
set_errno() can be used when __OUTSIDE_CYGWIN__.
(main): Call cygserver_init() to set up cygserver_running and add
checks against this to (try and) prevent multiple copies of
cygserver running simultaneously. Remember to delete all
transport connections so that (one day) the transport classes can
tidy up on cygserver shutdown.
Diffstat (limited to 'winsup/cygserver')
| -rw-r--r-- | winsup/cygserver/woutsup.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/winsup/cygserver/woutsup.h b/winsup/cygserver/woutsup.h index ae62ac63d..1e1d52c1d 100644 --- a/winsup/cygserver/woutsup.h +++ b/winsup/cygserver/woutsup.h @@ -38,16 +38,16 @@ /* The one function we use from winuser.h most of the time */ extern "C" DWORD WINAPI GetLastError (void); -/* From "winsup.h". */ +extern int cygserver_running; #if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L #define NEW_MACRO_VARARGS #endif /* - * A reproduction of the api_fatal() and <sys/strace.h> macros. This - * allows code that runs both inside and outside the Cygwin DLL to use - * the same macros for logging messages. + * A reproduction of the <sys/strace.h> macros. This allows code that + * runs both inside and outside the Cygwin DLL to use the same macros + * for logging messages. */ extern "C" void __cygserver__printf (const char *, const char *, ...); @@ -74,8 +74,6 @@ extern "C" void __cygserver__printf (const char *, const char *, ...); #endif /* !NEW_MACRO_VARARGS */ -#define api_fatal system_printf - #ifdef DEBUGGING #define debug_printf system_printf #define paranoid_printf system_printf |