summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2010-05-17 19:39:54 +0200
committerJeremy Huddleston <jeremyhu@apple.com>2010-11-13 12:10:37 -0800
commitb4bb374cc356be0a416f1d7f52dbb2adb6e512d3 (patch)
tree2aac60e80bd6b879909d8ce417722e3c2a1961b4
parentf51f1de995f0e3f0983c873ae51f7c6ae11699cf (diff)
os: include dix-config.h, not xorg-config.h
os/strlc{at,py}.c were trying to include xorg-config.h, which is not available in dix. Signed-off-by: Julien Cristau <jcristau@debian.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 69e8e1b0b95a325da3e3a2d76d092e7131baa9ad)
-rw-r--r--os/strlcat.c4
-rw-r--r--os/strlcpy.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/os/strlcat.c b/os/strlcat.c
index 91ceabb1c..7d53b0a6a 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -15,8 +15,8 @@
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include <sys/types.h>
diff --git a/os/strlcpy.c b/os/strlcpy.c
index e8e1b0217..2e55b2e63 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -14,8 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include <sys/types.h>