From 70300fdb1c4f0834f83441fcd3fa029e110a7c2e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 15 Feb 2008 17:53:11 +0000 Subject: Perform whitespace cleanup throughout. * dcrt0.cc (signal_shift_subtract): Eliminate ancient backwards compatibility. (check_sanity_and_sync): Ditto. * winsup.h (SIGTOMASK): Ditto. Just use constant in signal calculation. * include/cygwin/version: Remove backwards signal mask compatibility define. * path.cc (symlink_info::check_sysfile): Cosmetic change. * registry.cc (get_registry_hive_path): Remove unneeded variable. * exceptions.cc (handle_sigsuspend): Eliminate thread signal mask and use either main sigmask or current thread sigmask. (set_process_mask): Ditto. (sighold): Ditto. (sigrelse): Ditto. (sigset): Ditto. (set_process_mask_delta): Ditto. (_cygtls::call_signal_handler): Ditto. * fhandler_process.cc (format_process_status): Ditto. * fhandler_termios.cc (fhandler_termios::bg_check): Ditto. * pinfo.h (class pinfo): Ditto. * select.cc (pselect): Ditto. * signal.cc (sigprocmask): Ditto. (abort): Ditto. (sigpause): Ditto. (sigsend): Ditto. (wait_sig): Ditto. * thread.h (pthread::parent_tls): New member. * thread.cc (pthread::pthread): Record parent_tls here. (pthread::thread_init_wrapper): Initialize sigmask from parent thread. --- winsup/cygwin/include/cygwin/config.h | 4 ++-- winsup/cygwin/include/cygwin/version.h | 4 +--- winsup/cygwin/include/strings.h | 2 +- winsup/cygwin/include/sys/stdio.h | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'winsup/cygwin/include') diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h index f0f1c8aa8..dafd35125 100644 --- a/winsup/cygwin/include/cygwin/config.h +++ b/winsup/cygwin/include/cygwin/config.h @@ -25,11 +25,11 @@ extern "C" { which will be used throughout the library whereever there is a _r version of a function that takes _REENT. This saves the overhead of a function call for what amounts to a simple computation. - + The definition below is essentially equivalent to the one in cygtls.h (&_my_tls.local_clib) however it uses a fixed precomputed offset rather than dereferencing a field of a structure. - + Including tlsoffets.h here in order to get this constant offset tls_local_clib is a bit of a hack, but the alternative would require dragging the entire definition of struct _cygtls (a large and complex diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 6690ebcb5..da6f3ceae 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -62,8 +62,6 @@ details. */ /* Every version of cygwin <= this uses an old, incorrect method to determine signal masks. */ -#define CYGWIN_VERSION_DLL_BAD_SIGNAL_MASK 19005 - #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) @@ -311,7 +309,7 @@ details. */ 169: Export confstr. 170: Export insque, remque. 171: Export exp10, exp10f, pow10, pow10f, strcasestr, funopen, - fopencookie. + fopencookie. 172: Export getifaddrs, freeifaddrs. 173: Export __assert_func. 174: Export stpcpy, stpncpy. diff --git a/winsup/cygwin/include/strings.h b/winsup/cygwin/include/strings.h index e61e6a533..a443ee51f 100644 --- a/winsup/cygwin/include/strings.h +++ b/winsup/cygwin/include/strings.h @@ -25,7 +25,7 @@ int _EXFUN(bcmp,(const void *, const void *, size_t)); void _EXFUN(bcopy,(const void *, void *, size_t)); void _EXFUN(bzero,(void *, size_t)); int _EXFUN(ffs,(int)); -char *_EXFUN(index,(const char *, int)); +char *_EXFUN(index,(const char *, int)); char *_EXFUN(rindex,(const char *, int)); int _EXFUN(strcasecmp,(const char *, const char *)); int _EXFUN(strncasecmp,(const char *, const char *, size_t)); diff --git a/winsup/cygwin/include/sys/stdio.h b/winsup/cygwin/include/sys/stdio.h index 40b18b3be..7aa46a000 100644 --- a/winsup/cygwin/include/sys/stdio.h +++ b/winsup/cygwin/include/sys/stdio.h @@ -20,15 +20,15 @@ details. */ #if !defined(__SINGLE_THREAD__) # if !defined(_flockfile) # define _flockfile(fp) ({ if (!((fp)->_flags & __SSTR)) \ - __cygwin_lock_lock ((_LOCK_T *)&(fp)->_lock); }) + __cygwin_lock_lock ((_LOCK_T *)&(fp)->_lock); }) # endif # if !defined(_ftrylockfile) # define _ftrylockfile(fp) (((fp)->_flags & __SSTR) ? 0 : \ - __cygwin_lock_trylock ((_LOCK_T *)&(fp)->_lock)) + __cygwin_lock_trylock ((_LOCK_T *)&(fp)->_lock)) # endif # if !defined(_funlockfile) # define _funlockfile(fp) ({ if (!((fp)->_flags & __SSTR)) \ - __cygwin_lock_unlock ((_LOCK_T *)&(fp)->_lock); }) + __cygwin_lock_unlock ((_LOCK_T *)&(fp)->_lock); }) # endif #endif -- cgit v1.2.3