[PATCH xserver 3/8] bsd: Variable devConsoleFd need only if defined PCCONS_SUPPORT

Jamey Sharp jamey at minilop.net
Thu Sep 15 12:49:30 PDT 2011


Again, based purely on code inspection, this looks right.

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Thu, Sep 15, 2011 at 11:20:23PM +0600, Alexandr Shadchin wrote:
> Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
> ---
>  hw/xfree86/os-support/bsd/bsd_init.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
> index e5c8495..84c6b3d 100644
> --- a/hw/xfree86/os-support/bsd/bsd_init.c
> +++ b/hw/xfree86/os-support/bsd/bsd_init.c
> @@ -41,7 +41,10 @@
>  #include <errno.h>
>  
>  static Bool KeepTty = FALSE;
> +
> +#ifdef PCCONS_SUPPORT
>  static int devConsoleFd = -1;
> +#endif
>  #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
>  static int VTnum = -1;
>  static int initialVT = -1;
> @@ -694,8 +697,10 @@ xf86CloseConsole()
>      }
>  
>      close(xf86Info.consoleFd);
> +#ifdef PCCONS_SUPPORT
>      if (devConsoleFd >= 0)
>  	close(devConsoleFd);
> +#endif
>      return;
>  }
>  
> -- 
> 1.7.6
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/f61461c2/attachment.pgp>


More information about the xorg-devel mailing list