From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xfree86/os-support/hurd/hurd_init.c | 43 +++++++++++----------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'xorg-server/hw/xfree86/os-support/hurd/hurd_init.c') diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c index 94e261553..185b2b951 100644 --- a/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c +++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c @@ -44,39 +44,38 @@ #include int -xf86ProcessArgument( int argc,char **argv, int i ) +xf86ProcessArgument(int argc, char **argv, int i) { return 0; } + void xf86UseMsg() { return; } - void xf86OpenConsole() { - if( serverGeneration == 1 ) - { - kern_return_t err; - mach_port_t device; - int fd; - err = get_privileged_ports( NULL, &device ); - if( err ) - { - errno = err; - FatalError( "xf86KbdInit can't get_privileged_ports. (%s)\n" , strerror(errno) ); - } - mach_port_deallocate (mach_task_self (), device); - - if( ( fd = open( "/dev/kbd" , O_RDONLY|O_NONBLOCK ) ) < 0 ) - { - fprintf( stderr , "Cannot open keyboard (%s)\n",strerror(errno) ); - exit(1); - } - xf86Info.consoleFd = fd; + if (serverGeneration == 1) { + kern_return_t err; + mach_port_t device; + int fd; + + err = get_privileged_ports(NULL, &device); + if (err) { + errno = err; + FatalError("xf86KbdInit can't get_privileged_ports. (%s)\n", + strerror(errno)); + } + mach_port_deallocate(mach_task_self(), device); + + if ((fd = open("/dev/kbd", O_RDONLY | O_NONBLOCK)) < 0) { + fprintf(stderr, "Cannot open keyboard (%s)\n", strerror(errno)); + exit(1); + } + xf86Info.consoleFd = fd; } return; } @@ -84,6 +83,6 @@ xf86OpenConsole() void xf86CloseConsole() { - close( xf86Info.consoleFd ); + close(xf86Info.consoleFd); return; } -- cgit v1.2.3