Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.

[gnu-emacs] / src / tparam.c

diff --git a/src/tparam.c b/src/tparam.c
index ae12e72ac7bda6ed249cd3a598a4c78ad275254c..7d3752713faf16fdbe94a7b4b71141f8dd440a88 100644 (file)
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -21,7 +21,9 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #endif
 
-#ifndef emacs
+#ifdef emacs
+#include "lisp.h"              /* for xmalloc */
+#else
 #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
 #define bcopy(s, d, n) memcpy ((d), (s), (n))
 #endif
@@ -290,6 +292,9 @@ tparam1 (string, outstring, len, up, left, argp)
            case 'D':           /* %D means weird Delta Data transformation.  */
              argp[0] -= 2 * (tem % 16);
              break;
+
+           default:
+             abort ();
            }
        }
       else