[PATCH xserver] dix: Remove bogus input_mutex and input_mutex_count definitions from globals.c

Peter Hutterer peter.hutterer at who-t.net
Mon May 30 04:17:45 UTC 2016


On Sun, May 29, 2016 at 07:06:22PM -0700, Keith Packard wrote:
> These are local to inputthread.c; the ones in globals.c aren't
> declared in any header file.
> 
> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  dix/globals.c | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/dix/globals.c b/dix/globals.c
> index e313930..f36a938 100644
> --- a/dix/globals.c
> +++ b/dix/globals.c
> @@ -132,12 +132,3 @@ Bool explicit_display = FALSE;
>  char *ConnectionInfo;
>  
>  CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
> -
> -#if DEBUG_INPUT_MUTEX
> -#define INPUT_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
> -#else
> -#define INPUT_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
> -#endif
> -
> -pthread_mutex_t input_mutex = INPUT_MUTEX_INITIALIZER;
> -__thread int input_mutex_count;

did you need the __thread for the one in os/inputthread.c?

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net> otherwise

Cheers,
   Peter


More information about the xorg-devel mailing list