xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/os-support/bsd/bsd_init.c |    1 -
 include/dix.h                        |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 91131037a2d2e07079de5d222d8a8c95300750cc
Author: Alexandr Shadchin <alexandr.shadchin at gmail.com>
Date:   Sat Oct 29 00:14:32 2011 +0600

    Fix position _X_EXPORT
    
    Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/dix.h b/include/dix.h
index b1bf9ed..34661f3 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -571,8 +571,8 @@ typedef struct {
 
 extern int XItoCoreType(int xi_type);
 extern Bool DevHasCursor(DeviceIntPtr pDev);
-extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
-extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
+extern _X_EXPORT Bool IsPointerDevice(DeviceIntPtr dev);
+extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev);
 extern Bool IsPointerEvent(InternalEvent *event);
 extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
 extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev);
commit 219bcec73d3554c57b87f28812ab06a66b739b19
Author: Alexandr Shadchin <alexandr.shadchin at gmail.com>
Date:   Sat Oct 29 00:14:31 2011 +0600

    bsd: Remove odd message about -sharevts
    
    This is missing in commit 'xfree86: move -novtswitch & -sharevts argument
    handling up to common layer'
    
    Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 8446179..b58d6a7 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -710,7 +710,6 @@ xf86UseMsg()
 {
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	ErrorF("vtXX                   use the specified VT number (1-12)\n");
-	ErrorF("-sharevts              share VTs with another X server\n");
 #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
 	ErrorF("-keeptty               ");
 	ErrorF("don't detach controlling tty (for debugging only)\n");