Wait, this fix is cleaner

This commit is contained in:
rdb 2010-01-16 08:49:48 +00:00
parent a7cd0077b7
commit b4fa8e90f9
2 changed files with 4 additions and 10 deletions

View File

@ -20,12 +20,9 @@
#ifdef HAVE_XRANDR
// Ugly workaround around the conflicting definition
// of Connection that randr.h provides.
#define _RANDR_H_
typedef unsigned short Connection;
typedef unsigned short Rotation;
typedef unsigned short SizeID;
typedef unsigned short SubpixelOrder;
#define Connection XConnection
#include <X11/extensions/Xrandr.h>
#undef Connection
#endif
TypeHandle x11GraphicsPipe::_type_handle;

View File

@ -39,12 +39,9 @@
#ifdef HAVE_XRANDR
// Ugly workaround around the conflicting definition
// of Connection that randr.h provides.
#define _RANDR_H_
typedef unsigned short Connection;
typedef unsigned short Rotation;
typedef unsigned short SizeID;
typedef unsigned short SubpixelOrder;
#define Connection XConnection
#include <X11/extensions/Xrandr.h>
#undef Connection
#endif
#ifdef HAVE_LINUX_INPUT_H