Re: [screen-devel] d94037c08a6d fails to build

[Jeroen Roovers]

On Wed, 10 Apr 2013 12:25:22 +0100
Christian Ebert <blacktr...@gmx.net> wrote:

> Hi,
> 
> Current git HEAD d94037c08a6d fails to build like so:
> 
> In file included from screen.h:151,
>                  from ansi.c:36:
> window.h:261: warning: ‘utmp’ is deprecated (declared
> at /usr/include/utmp.h:97) ansi.c: In function ‘MFindUsedLine’:
> ansi.c:2930: error: ‘struct win’ has no member named ‘encoding’
> make: *** [ansi.o] Error 1
> 
> The utmp warning is harmless and to be expected on Mac OS 10.5.8.
> 
> uname -mprsv
> Darwin 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT
> 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386 i386
> 

I think the attached patch is correct.


     jer

--- a/src/ansi.c
+++ b/src/ansi.c
@@ -2927,7 +2927,7 @@
 # endif
 #endif
 #ifdef UTF8
-      if (p->encoding == UTF8)
+      if (p->w_encoding == UTF8)
        {
          if (ml->font != null && bcmp((char*)ml->font, null, p->w_width))
            break;