From: Peter Howkins <flibble@users.sourceforge.net>
Date: Wed, 14 Mar 2012 13:50:42 +0000 (+0000)
Subject: On linux do not include X11/Xlocale.h but locale.h, this prevents
X-Git-Tag: 2.2.0a~26^2~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=32e8c91d441ac45ccf135744cb7c0a854e9dd122;p=oweals%2Fcde.git

On linux do not include X11/Xlocale.h but locale.h, this prevents
Xlocale.h redefining setlocate() into _Xsetlocale() that it then can't
find and link against.
---

diff --git a/cde/programs/dtudcfonted/libfal/_fallcWrap.c b/cde/programs/dtudcfonted/libfal/_fallcWrap.c
index fbab0100..39635b89 100644
--- a/cde/programs/dtudcfonted/libfal/_fallcWrap.c
+++ b/cde/programs/dtudcfonted/libfal/_fallcWrap.c
@@ -81,7 +81,11 @@ from the X Consortium.
 
 #include "_fallibint.h"
 #include "_fallcint.h"
+#if defined(linux)
+#include <locale.h>
+#else
 #include <X11/Xlocale.h>
+#endif
 #include <X11/Xos.h>
 #ifdef WIN32
 #undef close