From 26f7239a0111a0915ba121c292ced276e3942900 Mon Sep 17 00:00:00 2001
From: Niveditha Rau <Niveditha.Rau@Oracle.COM>
Date: Fri, 17 May 2013 15:26:21 -0700
Subject: Make sure internal headers include required headers

Fixes builds with Solaris Studio 12.3 when lint is enabled, since it no
longer ignores *.h files, but complains when they reference undefined
typedefs or macros.

Signed-off-by: Niveditha Rau <Niveditha.Rau@Oracle.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/lib/X11/Cmap.h         | 2 ++
 nx-X11/lib/X11/Cr.h           | 2 ++
 nx-X11/lib/X11/Key.h          | 3 +++
 nx-X11/lib/X11/Xintatom.h     | 1 +
 nx-X11/lib/X11/Xintconn.h     | 1 +
 nx-X11/lib/X11/Xprivate.h     | 2 ++
 nx-X11/lib/X11/Xresinternal.h | 2 ++
 nx-X11/lib/X11/locking.h      | 2 ++
 8 files changed, 15 insertions(+)

(limited to 'nx-X11/lib/X11')

diff --git a/nx-X11/lib/X11/Cmap.h b/nx-X11/lib/X11/Cmap.h
index 062b5383b..db2de5697 100644
--- a/nx-X11/lib/X11/Cmap.h
+++ b/nx-X11/lib/X11/Cmap.h
@@ -2,6 +2,8 @@
 #ifndef _CMAP_H_
 #define _CMAP_H_
 
+#include <nx-X11/Xlib.h>
+
 extern void
 _XcmsDeleteCmapRec(
     Display *dpy,
diff --git a/nx-X11/lib/X11/Cr.h b/nx-X11/lib/X11/Cr.h
index 800c9ab1c..e71d86d1c 100644
--- a/nx-X11/lib/X11/Cr.h
+++ b/nx-X11/lib/X11/Cr.h
@@ -2,6 +2,8 @@
 #ifndef _CR_H_
 #define _CR_H_
 
+#include <nx-X11/Xlib.h>
+
 extern int _XUpdateGCCache(
     register GC gc,
     register unsigned long mask,
diff --git a/nx-X11/lib/X11/Key.h b/nx-X11/lib/X11/Key.h
index 0fe89ba37..3a1639c5c 100644
--- a/nx-X11/lib/X11/Key.h
+++ b/nx-X11/lib/X11/Key.h
@@ -2,6 +2,9 @@
 #ifndef _KEY_H_
 #define _KEY_H_
 
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xresource.h>
+
 #ifndef NEEDKTABLE
 extern const unsigned char _XkeyTable[];
 #endif
diff --git a/nx-X11/lib/X11/Xintatom.h b/nx-X11/lib/X11/Xintatom.h
index f4057798d..b2d307bab 100644
--- a/nx-X11/lib/X11/Xintatom.h
+++ b/nx-X11/lib/X11/Xintatom.h
@@ -2,6 +2,7 @@
 #ifndef _XINTATOM_H_
 #define _XINTATOM_H_ 1
 
+#include <nx-X11/Xlib.h>
 #include <nx-X11/Xfuncproto.h>
 
 /* IntAtom.c */
diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/X11/Xintconn.h
index 54200ed9f..675f684ac 100644
--- a/nx-X11/lib/X11/Xintconn.h
+++ b/nx-X11/lib/X11/Xintconn.h
@@ -3,6 +3,7 @@
 #define _XINTCONN_H_ 1
 
 #include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xlib.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/lib/X11/Xprivate.h b/nx-X11/lib/X11/Xprivate.h
index ebe51c1ed..bc8dbf4d9 100644
--- a/nx-X11/lib/X11/Xprivate.h
+++ b/nx-X11/lib/X11/Xprivate.h
@@ -8,6 +8,8 @@
 #ifndef XPRIVATE_H
 #define XPRIVATE_H
 
+#include <nx-X11/Xlib.h>
+
 extern void _XIDHandler(Display *dpy);
 extern void _XSeqSyncFunction(Display *dpy);
 extern void _XSetPrivSyncFunction(Display *dpy);
diff --git a/nx-X11/lib/X11/Xresinternal.h b/nx-X11/lib/X11/Xresinternal.h
index c2f355fe6..c740102b6 100644
--- a/nx-X11/lib/X11/Xresinternal.h
+++ b/nx-X11/lib/X11/Xresinternal.h
@@ -2,6 +2,8 @@
 #ifndef _XRESINTERNAL_H_
 #define _XRESINTERNAL_H_
 
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xresource.h>
 #include <inttypes.h>
 
 /* type defines */
diff --git a/nx-X11/lib/X11/locking.h b/nx-X11/lib/X11/locking.h
index 7126e61d8..0942b95aa 100644
--- a/nx-X11/lib/X11/locking.h
+++ b/nx-X11/lib/X11/locking.h
@@ -36,6 +36,8 @@ in this Software without prior written authorization from The Open Group.
 
 #define xmalloc(s) Xmalloc(s)
 #define xfree(s) Xfree(s)
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
 #include <nx-X11/Xthreads.h>
 
 struct _XCVList {
-- 
cgit v1.2.3