From 4fa35ef03774367a7a776208f04d420af3506ab7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Sep 2015 11:55:28 -0700 Subject: [PATCH] Port Unicode char detection to FreeBSD+svgalib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem reported by Ashish SHUKLA in: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00531.html * configure.ac: Check for struct unipair.unicode instead of for , since that’s more specific to what the code actually needs. * src/terminal.c: Use HAVE_STRUCT_UNIPAIR_UNICODE, not HAVE_LINUX_KD_H. --- configure.ac | 3 ++- src/terminal.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index cd828de..f86d29e 100644 --- a/configure.ac +++ b/configure.ac @@ -1582,7 +1582,6 @@ fi dnl checks for header files AC_CHECK_HEADERS_ONCE( - linux/kd.h sys/systeminfo.h sys/sysinfo.h coff.h pty.h @@ -3999,6 +3998,8 @@ AC_SUBST(KRB4LIB) AC_CHECK_HEADERS(valgrind/valgrind.h) +AC_CHECK_MEMBERS([struct unipair.unicode], [], [], [[#include ]]) + AC_CHECK_FUNCS_ONCE(tzset) ok_so_far=yes diff --git a/src/terminal.c b/src/terminal.c index d7c16d9..80c6aa2 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -28,7 +28,7 @@ along with GNU Emacs. If not, see . */ #include "coding.h" #include "keyboard.h" -#ifdef HAVE_LINUX_KD_H +#if HAVE_STRUCT_UNIPAIR_UNICODE # include # include # include @@ -532,7 +532,7 @@ selected frame's terminal). */) return store_terminal_param (decode_live_terminal (terminal), parameter, value); } -#if HAVE_LINUX_KD_H +#if HAVE_STRUCT_UNIPAIR_UNICODE /* Compute the glyph code table for T. */ @@ -575,7 +575,7 @@ calculate_glyph_code_table (struct terminal *t) Lisp_Object terminal_glyph_code (struct terminal *t, int ch) { -#if HAVE_LINUX_KD_H +#if HAVE_STRUCT_UNIPAIR_UNICODE if (t->type == output_termcap) { /* As a hack, recompute the table when CH is the maximum -- 2.1.4