summaryrefslogtreecommitdiff
path: root/src/xutf8
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-04-13 06:29:37 +0000
committerManolo Gouy <Manolo>2016-04-13 06:29:37 +0000
commit120e8dca56aa88e1ee08d55267166b49f28fc898 (patch)
tree228d41c048b95aba2cdd47ebd5c4fb433a7a0f97 /src/xutf8
parente840f496a9cc87ef55c6f0f21b318bc0e5edd6c7 (diff)
Use FL_CFG_WIN_X11 when appropriate
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11594 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/xutf8')
-rw-r--r--src/xutf8/keysym2Ucs.c6
-rw-r--r--src/xutf8/utf8Utils.c6
-rw-r--r--src/xutf8/utf8Wrap.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c
index 6115b8c2e..aa46eef77 100644
--- a/src/xutf8/keysym2Ucs.c
+++ b/src/xutf8/keysym2Ucs.c
@@ -16,9 +16,9 @@
#define KEYSYM2UCS_INCLUDED
-#include <config.h>
+#include "../config_lib.h"
-#if defined(USE_X11)
+#if defined(FL_CFG_WIN_X11)
#include "../Xutf8.h"
#include "imKStoUCS.c"
@@ -27,7 +27,7 @@ long XKeysymToUcs(KeySym keysym) {
return (long) KeySymToUcs4(keysym);
}
-#endif /* X11 only */
+#endif /* FL_CFG_WIN_X11 */
/*
* End of "$Id$".
diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c
index f525f4946..ebbf11273 100644
--- a/src/xutf8/utf8Utils.c
+++ b/src/xutf8/utf8Utils.c
@@ -14,13 +14,13 @@
* http://www.fltk.org/str.php
*/
-#include <config.h>
+#include "../config_lib.h"
/*
* Unicode to UTF-8 conversion functions.
*/
-#if defined(USE_X11)
+#if defined(FL_CFG_WIN_X11)
#include "../Xutf8.h"
@@ -224,7 +224,7 @@ XFastConvertUtf8ToUcs(const unsigned char *buf,
return -1;
}
-#endif /* X11 only */
+#endif /* FL_CFG_WIN_X11 */
/*
* End of "$Id$".
diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c
index 4920ab02d..07fc1c6cd 100644
--- a/src/xutf8/utf8Wrap.c
+++ b/src/xutf8/utf8Wrap.c
@@ -14,12 +14,12 @@
* http://www.fltk.org/str.php
*/
-#include <config.h>
+#include "../config_lib.h"
/*
* X11 UTF-8 text drawing functions.
*/
-#if defined(USE_X11)
+#if defined(FL_CFG_WIN_X11)
#include "../Xutf8.h"
#include <X11/Xlib.h>
@@ -1023,7 +1023,7 @@ XFreeUtf8FontStruct(Display *dpy,
free(font_set);
}
-#endif /* X11 only */
+#endif /* FL_CFG_WIN_X11 */
/*
* End of "$Id$".