TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Wait, this fix is cleaner

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/x11display/x11GraphicsPipe.cxx
View File

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

7
panda/src/x11display/x11GraphicsWindow.cxx
View File

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