← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xserver-xorg-video-intel/karmic-proposed

« back to all changes in this revision

Viewing changes to uxa/uxa-priv.h

  • Committer: Bazaar Package Importer
  • Author(s): Brice Goglin
  • Date: 2009-09-23 01:03:49 UTC
  • mfrom: (1.3.4 upstream) (1.2.9 sid)
  • mto: (1.5.3 squeeze)
  • mto: This revision was merged to the branch mainline in revision 102.
  • Revision ID: james.westby@ubuntu.com-20090923010349-dyyejg48nm80lh8u
Tags: 2:2.8.99.902-1
http://bugs.debian.org/543326
* New upstream release candidate.
  + Fix crash on server regen, closes: #543326.

Show diffs side-by-side

added added

removed removed

Lines of Context:
uxa/uxa-priv.h
42
42
#define NEED_EVENTS
43
43
#include <X11/Xproto.h>
44
44
#ifdef MITSHM
 
45
#ifdef HAVE_XEXTPROTO_71
 
46
#include <X11/extensions/shm.h>
 
47
#else
45
48
#define _XSHM_SERVER_
46
49
#include <X11/extensions/shmstr.h>
47
50
#endif
 
51
#endif
48
52
#include "scrnintstr.h"
49
53
#include "pixmapstr.h"
50
54
#include "windowstr.h"
321
325
extern const GCOps uxa_ops;
322
326
 
323
327
#ifdef MITSHM
324
 
extern ShmFuncs uxa_shm_funcs;
325
 
 
326
328
/* XXX these come from shmint.h, which isn't exported by the server */
 
329
 
 
330
#ifdef HAVE_XEXTPROTO_71
 
331
#include "shmint.h"
 
332
#else
 
333
 
327
334
void
328
335
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
329
336
 
332
339
 
333
340
void
334
341
fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
 
342
#endif
 
343
 
 
344
extern ShmFuncs uxa_shm_funcs;
335
345
 
336
346
#endif
337
347