[PATCH] Fix build error in terminal.c on FreeBSD

[Ashish SHUKLA]

Hi,

On FreeBSD (and pretty sure other non-GNU/Linux platforms) with svgalib port
(which provides stub <linux/kd.h>) installed, I get following error with emacs
HEAD (commit: 6514b30e6):

--8<---------------cut here---------------start------------->8---
  CC       terminal.o
terminal.c:545:32: error: array has incomplete element type 'struct unipair'
  struct unipair unipair_buffer[initial_unipairs];
                               ^
terminal.c:545:10: note: forward declaration of 'struct unipair'
  struct unipair unipair_buffer[initial_unipairs];
         ^
terminal.c:552:25: error: variable has incomplete type 'struct unimapdesc'
      struct unimapdesc unimapdesc = { entry_ct, entries };
                        ^
terminal.c:552:14: note: forward declaration of 'struct unimapdesc'
      struct unimapdesc unimapdesc = { entry_ct, entries };
             ^
terminal.c:553:22: error: use of undeclared identifier 'GIO_UNIMAP'; did you 
mean 'GDK_UNMAP'?
      if (ioctl (fd, GIO_UNIMAP, &unimapdesc) == 0)
                     ^~~~~~~~~~
                     GDK_UNMAP
/usr/local/include/gtk-3.0/gdk/gdkevents.h:309:3: note: 'GDK_UNMAP' declared 
here
  GDK_UNMAP             = 15,
  ^
terminal.c:557:39: error: subscript of pointer to incomplete type 'struct 
unipair'
            char_table_set (glyphtab, entries[i].unicode,
                                      ~~~~~~~^
terminal.c:545:10: note: forward declaration of 'struct unipair'
  struct unipair unipair_buffer[initial_unipairs];
         ^
terminal.c:564:64: error: invalid application of 'sizeof' to an incomplete type 
'struct unipair'
      entries = alloced = xrealloc (alloced, entry_ct * sizeof *alloced);
                                                               ^~~~~~~~
terminal.c:545:10: note: forward declaration of 'struct unipair'
  struct unipair unipair_buffer[initial_unipairs];
         ^
5 errors generated.
Makefile:363: recipe for target 'terminal.o' failed
gmake[3]: *** [terminal.o] Error 1
--8<---------------cut here---------------end--------------->8---

This seems to have come from commit 6e5d81ff4 (cc'ed author). A probable fix
is attached.

Also, if you don't mind could you please Cc me on replies, as I've delivery
disabled in list subscription.

Thanks!
-- 
Ashish SHUKLA

“Any priest or shaman must be presumed guilty until proved innocent.” (Robert
A. Heinlein, 1973)

Sent from my Emacs

terminal.c.diff
Description: Text Data

signature.asc
Description: PGP signature