summaryrefslogtreecommitdiff
path: root/xfixes
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
commite03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /xfixes
parentb8aef6c474ffc6d637bec178674898ea95ccde47 (diff)
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to <X11/fonts/foo.h>.
Diffstat (limited to 'xfixes')
-rwxr-xr-xxfixes/cursor.c4
-rwxr-xr-xxfixes/region.c4
-rwxr-xr-xxfixes/saveset.c4
-rwxr-xr-xxfixes/select.c4
-rwxr-xr-xxfixes/xfixes.c4
-rwxr-xr-xxfixes/xfixes.h4
-rwxr-xr-xxfixes/xfixesint.h4
7 files changed, 28 insertions, 0 deletions
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 882022aad..25b0fac6e 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/xfixes/region.c b/xfixes/region.c
index b0073f5b3..1ee2cd744 100755
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 3c93726ec..780aeb57b 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/xfixes/select.c b/xfixes/select.c
index a40ef1773..71addd470 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index bf07f66f1..38e9b39c1 100755
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index e1e3e0942..0f1e3b070 100755
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _XFIXES_H_
#define _XFIXES_H_
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 05ab77d3f..079246797 100755
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _XFIXESINT_H_
#define _XFIXESINT_H_