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

« back to all changes in this revision

Viewing changes to src/ivch/ivch.c

  • 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
* New upstream release candidate.
  + Fix crash on server regen, closes: #543326.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
 
32
32
#include "xf86.h"
33
33
#include "xf86_OSproc.h"
34
 
#include "xf86Resources.h"
35
34
#include "compiler.h"
36
35
#include "miscstruct.h"
37
36
#include "xf86i2c.h"
38
37
#include "xf86Crtc.h"
 
38
#ifdef HAVE_XEXTPROTO_71
 
39
#include <X11/extensions/dpmsconst.h>
 
40
#else
39
41
#define DPMS_SERVER
40
42
#include <X11/extensions/dpms.h>
 
43
#endif
 
44
 
41
45
#include <unistd.h>
42
46
 
43
47
#include "../i2c_vid.h"