[BRLTTY] [PATCH] Re: Error messages in svn 4115

[Mario Lang]

Hermann <meinelisten at onlinehome.de> writes:

> the following error messages:
>
> eu_clio.c: In function ‘clio_init’:
> eu_clio.c:325: error: ‘BrailleDisplay’ has no member named ‘y’
> eu_clio.c:326: error: ‘BrailleDisplay’ has no member named ‘x’
> eu_clio.c: In function ‘clio_writeWindow’:
> eu_clio.c:400: error: ‘BrailleDisplay’ has no member named ‘x’
> eu_clio.c:400: error: ‘BrailleDisplay’ has no member named ‘y’
> eu_clio.c: In function ‘clio_writeVisual’:
> eu_clio.c:421: error: ‘BrailleDisplay’ has no member named ‘x’
> eu_clio.c:421: error: ‘BrailleDisplay’ has no member named ‘y’
> make[2]: *** [eu_clio.o] Error 1
> make[1]: *** [braille-drivers] Error 1
> make: *** [all] Error 2
>
> What to do?

Either apply the attached patch or wait for Dave to apply it to svn.

diff --git a/BrailleDrivers/EuroBraille/eu_clio.c b/BrailleDrivers/EuroBraille/eu_clio.c
index 023e468..f5e034e 100644
--- a/BrailleDrivers/EuroBraille/eu_clio.c
+++ b/BrailleDrivers/EuroBraille/eu_clio.c
@@ -322,8 +322,8 @@ int     clio_init(BrailleDisplay *brl, t_eubrl_io *io)
     }
   if (brlCols > 0)
     { /* Succesfully identified hardware. */
-      brl->y = 1;
-      brl->x = brlCols;
+      brl->textRows = 1;
+      brl->textColumns = brlCols;
       LogPrint(LOG_INFO, "eu: %s connected.",
 	       clioModels[brlModel].modelDesc);
       return (1);
@@ -397,7 +397,7 @@ int	clio_keyToCommand(BrailleDisplay *brl, unsigned int key, BRL_DriverCommandCo
 void     clio_writeWindow(BrailleDisplay *brl)
 {
   static char previousBrailleWindow[80];
-  int displaySize = brl->x * brl->y;
+  int displaySize = brl->textColumns * brl->textRows;
   unsigned char buf[displaySize + 3];
 
   if ( displaySize > sizeof(previousBrailleWindow) ) {
@@ -418,7 +418,7 @@ void     clio_writeWindow(BrailleDisplay *brl)
 void     clio_writeVisual(BrailleDisplay *brl, const wchar_t *text)
 {
   static wchar_t previousVisualDisplay[80];
-  int displaySize = brl->x * brl->y;
+  int displaySize = brl->textColumns * brl->textRows;
   unsigned char buf[displaySize + 3];
   int i;
 
diff --git a/BrailleDrivers/EuroBraille/eu_esysiris.c b/BrailleDrivers/EuroBraille/eu_esysiris.c
index c1da6cc..7fff12e 100644
--- a/BrailleDrivers/EuroBraille/eu_esysiris.c
+++ b/BrailleDrivers/EuroBraille/eu_esysiris.c
@@ -304,8 +304,8 @@ int	esysiris_init(BrailleDisplay *brl, t_eubrl_io *io)
     }
   if (brlCols > 0)
     { /* Succesfully identified hardware. */
-      brl->y = 1;
-      brl->x = brlCols;
+      brl->textRows = 1;
+      brl->textColumns = brlCols;
       LogPrint(LOG_INFO, "eu: %s connected.",
 	       modelTable[brlType]);
       return (1);
@@ -380,7 +380,7 @@ int	esysiris_keyToCommand(BrailleDisplay *brl, unsigned int key, BRL_DriverComma
 void	esysiris_writeWindow(BrailleDisplay *brl)
 {
   static unsigned char previousBrailleWindow[80];
-  int displaySize = brl->x * brl->y;
+  int displaySize = brl->textColumns * brl->textRows;
   unsigned char buf[displaySize + 2];
   
   if (displaySize > sizeof(previousBrailleWindow)) {

-- 
CYa,
  ⡍⠁⠗⠊⠕ | Debian Developer <URL:http://debian.org/>
  .''`. | Get my public key via finger mlang/key at db.debian.org
 : :' : | 1024D/7FC1A0854909BCCDBE6C102DDFFC022A6B113E44
 `. `'
   `-      <URL:http://delysid.org/>  <URL:http://www.staff.tugraz.at/mlang/>