mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
Wait, this fix is cleaner
This commit is contained in:
parent
a7cd0077b7
commit
b4fa8e90f9
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user