[BRLTTY] convertCharToWchar and reverse not found

[Raoul Mégélas]

Hi,


Samuel Thibault <samuel.thibault at ens-lyon.org>, le Thu 20 Feb 2007 a écrit :

>> rmgls at wanadoo.fr, le Sat 17 Feb 2007 09:46:32 +0100, a écrit :
>> cmd.o(.text+0x65e): In function `cmdBrlttyToBrlapi':
>> ./cmd.c:222: undefined reference to `convertCharToWchar'
>> cmd.o(.text+0x995): In function `cmdBrlapiToBrltty':
>> ./cmd.c:311: undefined reference to `convertWcharToChar'
>> brlapi_server.o(.text+0x887): In function `getDots':
>> ./brlapi_server.c:584: undefined reference to `convertWcharToChar'

>  Oops, two issues here:
> - configure doesn't seem to find iconv() on your system
> -  we don't handle that case properly.

Hi Samuel,

Thanks for your reply.

You are absolutely right on the two points:

- FreeBSD holds iconv.h in /usr/include/sys/ (i missed that, and don't cheked config.log!!! !!!)

- our iconv.h does not contain definition for some variables i.e. iconv_t.
let me see if i can post a patch (first job on brltty).
i will work on this next week.

of course your patch apply quit well here but does not solve all the problem.
i will try to complete it.

best regards

raoul
rmgls at wanadoo.fr

========================================
Index: Programs/charset.c
===================================================================
--- Programs/charset.c	(r�vision 2902)
+++ Programs/charset.c	(copie de travail)
@@ -175,6 +175,17 @@
   if (wc == WEOF) return EOF;
   return convertWcharToChar(wc);
 }
+#else /* !HAVE_ICONV_H && !WINDOWS */
+/* Assume latin1 encoding */
+wint_t convertCharToWchar (char c) {
+  return c;
+}
+int convertWcharToChar (wchar_t wc) {
+  if (wc < 0x100)
+    return wc;
+  else
+    return EOF;
+}
 #endif /* conversions */
 
 static const char *