summaryrefslogtreecommitdiffstats
path: root/Xserver/hw/rdp/rdp.h
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2006-09-04 21:47:21 +0000
committerjsorg71 <jsorg71>2006-09-04 21:47:21 +0000
commitd221fea7fce398d0f0a2da9cf79fa0341429886c (patch)
tree923e76e0c2ba7b1094584d99c0fafc8356367ea5 /Xserver/hw/rdp/rdp.h
parent909c06c781bc0877e9ea9dec4a355d61115af6cf (diff)
downloadxrdp-proprietary-d221fea7fce398d0f0a2da9cf79fa0341429886c.tar.gz
xrdp-proprietary-d221fea7fce398d0f0a2da9cf79fa0341429886c.zip
got XFree86 4.6 and Xorg 6.9.0 compiling
Diffstat (limited to 'Xserver/hw/rdp/rdp.h')
-rw-r--r--Xserver/hw/rdp/rdp.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/Xserver/hw/rdp/rdp.h b/Xserver/hw/rdp/rdp.h
index eae8907c..c1e944e4 100644
--- a/Xserver/hw/rdp/rdp.h
+++ b/Xserver/hw/rdp/rdp.h
@@ -53,6 +53,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "picturestr.h"
#include <netinet/tcp.h>
+/* test to see if this is xorg source or xfree86 */
+#ifdef XORGSERVER
+# define RDP_IS_XORG
+#else
+# include <xf86Version.h>
+# if (XF86_VERSION_MAJOR == 4 && XF86_VERSION_MINOR > 3)
+# define RDP_IS_XFREE86
+# elif (XF86_VERSION_MAJOR > 4)
+# define RDP_IS_XFREE86
+# else
+# define RDP_IS_XORG
+# endif
+#endif
+
/* Per-screen (framebuffer) structure. There is only one of these, since we
don't allow the X server to have multiple screens. */
typedef struct