From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 11 Apr 2013 10:48:27 +0000 (+0000)
Subject: Add some missing headers. It is not really ok to include Xutil.h
X-Git-Tag: v1.2.90~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98914846b3723ddbc1f4de9955b730b7291f9425;p=tigervnc.git

Add some missing headers. It is not really ok to include Xutil.h
without first including Xlib.h.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5078 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index d36a4d76..cf6a7df2 100644
--- a/unix/xserver/hw/vnc/Input.cc
+++ b/unix/xserver/hw/vnc/Input.cc
@@ -49,6 +49,7 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey;
 #endif
 #include <X11/keysym.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef public
 #undef class
diff --git a/unix/xserver/hw/vnc/InputCore.cc b/unix/xserver/hw/vnc/InputCore.cc
index 63d94125..0fc4fe1e 100644
--- a/unix/xserver/hw/vnc/InputCore.cc
+++ b/unix/xserver/hw/vnc/InputCore.cc
@@ -44,6 +44,7 @@ extern "C" {
 #define XK_TECHNICAL
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef public
 #undef class
diff --git a/unix/xserver/hw/vnc/InputXKB.cc b/unix/xserver/hw/vnc/InputXKB.cc
index 4ac0d917..39d9252c 100644
--- a/unix/xserver/hw/vnc/InputXKB.cc
+++ b/unix/xserver/hw/vnc/InputXKB.cc
@@ -35,6 +35,8 @@ extern "C" {
 #include "eventstr.h"
 #include "scrnintstr.h"
 #include "mi.h"
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef public
 #undef class