← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Xext/shm.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:
Xext/shm.c
62
62
#define _XSHM_SERVER_
63
63
#include <X11/extensions/shmstr.h>
64
64
#include <X11/Xfuncproto.h>
65
 
#ifdef EXTMODULE
66
 
#include "xf86_ansic.h"
67
 
#endif
68
65
 
69
66
#ifdef PANORAMIX
70
67
#include "panoramiX.h"
115
112
static DISPATCH_PROC(SProcShmQueryVersion);
116
113
 
117
114
static unsigned char ShmReqCode;
118
 
int ShmCompletionCode;
119
 
int BadShmSegCode;
120
 
RESTYPE ShmSegType;
 
115
_X_EXPORT int ShmCompletionCode;
 
116
_X_EXPORT int BadShmSegCode;
 
117
_X_EXPORT RESTYPE ShmSegType;
121
118
static ShmDescPtr Shmsegs;
122
119
static Bool sharedPixmaps;
123
120
static int pixmapFormat;