1 --- a/src/xutf8/utf8Input.c
2 +++ b/src/xutf8/utf8Input.c
3 @@ -18,6 +18,7 @@
4
5 #include <config.h>
6 #include "../Xutf8.h"
7 +#include "../../FL/Fl_Export.H"
8 #include <X11/X.h>
9 #include <X11/Xlib.h>
10 #include <X11/Xutil.h>
11 @@ -53,7 +54,7 @@ typedef struct {
12 #include "lcUniConv/jisx0212.h"
13 #include "lcUniConv/ksc5601.h"
14
15 -static int
16 +FL_EXPORT static int
17 XConvertEucTwToUtf8(char* buffer_return, int len) {
18 /* FIXME */
19 #if HAVE_LIBC_ICONV
20 @@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
21 return l;
22 }
23
24 -static int
25 +FL_EXPORT static int
26 XConvertEucKrToUtf8(char* buffer_return, int len) {
27 int i = 0, l = 0;
28 char *buf;
29 @@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
30 return l;
31 }
32
33 -static int
34 +FL_EXPORT static int
35 XConvertBig5ToUtf8(char* buffer_return, int len) {
36 int i = 0, l = 0;
37 char *buf;
38 @@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
39 return l;
40 }
41
42 -static int
43 +FL_EXPORT static int
44 XConvertCp936extToUtf8(char* buffer_return, int len)
45 {
46 int i = 0, l = 0;
47 @@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
48 return l;
49 }
50
51 -static int
52 +FL_EXPORT static int
53 XConvertGb2312ToUtf8(char* buffer_return, int len) {
54 int i = 0, l = 0;
55 char *buf;
56 @@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
57 return l;
58 }
59
60 -static int
61 +FL_EXPORT static int
62 XConvertEucCnToUtf8(char* buffer_return, int len) {
63 int i = 0, l = 0;
64 char *buf;
65 @@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
66 return l;
67 }
68
69 -static int
70 +FL_EXPORT static int
71 XConvertEucJpToUtf8(char* buffer_return, int len) {
72 int i = 0, l = 0;
73 char *buf;
74 @@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
75 return l;
76 }
77
78 -static int
79 +FL_EXPORT static int
80 XConvertEucToUtf8(const char* locale,
81 char* buffer_return,
82 int len,
83 @@ -408,7 +409,7 @@ XConvertEucToUtf8(const char* locale,
84 return len;
85 }
86
87 -int
88 +FL_EXPORT int
89 XUtf8LookupString(XIC ic,
90 XKeyPressedEvent* event,
91 char* buffer_return,
92 --- a/src/xutf8/utf8Utils.c
93 +++ b/src/xutf8/utf8Utils.c
94 @@ -21,6 +21,7 @@
95 #if !defined(WIN32) && !defined(__APPLE__)
96
97 #include "../Xutf8.h"
98 +#include "../../FL/Fl_Export.H"
99
100 /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
101
102 @@ -29,7 +30,7 @@
103 * Returns the byte length of the converted UTF-8 char
104 * Returns -1 if the UTF-8 string is not valid
105 */
106 -int
107 +FL_EXPORT int
108 XConvertUtf8ToUcs(const unsigned char *buf,
109 int len,
110 unsigned int *ucs) {
111 @@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int ucs,
112 * returns the byte length of the first UTF-8 char
113 * (returns -1 if not valid)
114 */
115 -int
116 +FL_EXPORT int
117 XUtf8CharByteLen(const unsigned char *buf,
118 int len) {
119 unsigned int ucs;
120 @@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char *buf
121 /*
122 * Same as XConvertUtf8ToUcs but no sanity check is done.
123 */
124 -int
125 +FL_EXPORT int
126 XFastConvertUtf8ToUcs(const unsigned char *buf,
127 int len,
128 unsigned int *ucs) {
129 --- a/src/xutf8/utf8Wrap.c
130 +++ b/src/xutf8/utf8Wrap.c
131 @@ -20,6 +20,7 @@
132 #if !defined(WIN32) && !defined(__APPLE__)
133
134 #include "../Xutf8.h"
135 +#include "../../FL/Fl_Export.H"
136 #include <X11/Xlib.h>
137 #include <ctype.h>
138 #include <stdlib.h>
139 @@ -705,7 +706,7 @@ XUtf8_measure_extents(
140 /*****************************************************************************/
141 /** returns the pixel width of a UTF-8 string **/
142 /*****************************************************************************/
143 -int
144 +FL_EXPORT int
145 XUtf8TextWidth(XUtf8FontStruct *font_set,
146 const char *string,
147 int num_bytes) {
148 @@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_se
149 /*****************************************************************************/
150 /** get the X font and glyph ID of a UCS char **/
151 /*****************************************************************************/
152 -int
153 +FL_EXPORT int
154 XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set,
155 unsigned int ucs,
156 XFontStruct **fnt,
157 @@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *f
158 /*****************************************************************************/
159 /** returns the pixel width of a UCS char **/
160 /*****************************************************************************/
161 -int
162 +FL_EXPORT int
163 XUtf8UcsWidth(XUtf8FontStruct *font_set,
164 unsigned int ucs) {
165
|
