← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to xkb/ddxKillSrv.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
xkb/ddxKillSrv.c
45
45
#include <X11/extensions/XKBsrv.h>
46
46
#include <X11/extensions/XI.h>
47
47
 
48
 
#ifdef XF86DDXACTIONS
49
 
#include "xf86.h"
50
 
#endif
51
 
 
52
48
int
53
49
XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
54
50
{
55
 
#ifdef XF86DDXACTIONS
56
 
    xf86ProcessActionEvent(ACTION_TERMINATE, NULL);
57
 
#else
58
51
    GiveUp(1);
59
 
#endif
60
52
    return 0;
61
53
}