← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xkb/XKBGAlloc.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/XKBGAlloc.c
28
28
 
29
29
#ifdef HAVE_DIX_CONFIG_H
30
30
#include <dix-config.h>
31
 
#elif defined(HAVE_CONFIG_H)
32
 
#include <config.h>
33
31
#endif
34
32
 
35
33
#define NEED_EVENTS
36
34
#define NEED_REPLIES
37
35
 
38
 
#ifndef XKB_IN_SERVER
39
 
 
40
 
#include <stdio.h>
41
 
#include "Xlibint.h"
42
 
#include "XKBlibint.h"
43
 
#include <X11/extensions/XKBgeom.h>
44
 
#include <X11/extensions/XKBproto.h>
45
 
 
46
 
#else 
47
 
 
48
36
#include <stdio.h>
49
37
#include <X11/X.h>
50
38
#include <X11/Xproto.h>
53
41
#include <X11/extensions/XKBsrv.h>
54
42
#include <X11/extensions/XKBgeom.h>
55
43
 
56
 
#endif /* XKB_IN_SERVER */
57
 
 
58
44
#ifdef X_NOT_POSIX
59
45
#define Size_t unsigned int
60
46
#else