From: Kenichi Handa <handa@m17n.org>
Date: Thu, 26 Apr 2007 00:37:14 +0000 (+0000)
Subject: (check_otf_features): Define it regardless of
X-Git-Tag: emacs-pretest-23.0.90~8295^2~530
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf385d93cc9c689763b187e69f38e556b490542b;p=emacs.git

(check_otf_features): Define it regardless of
HAVE_LIBOTF.
---

diff --git a/src/font.c b/src/font.c
index 1eedbe04bbc..db11387b2f4 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1480,6 +1480,33 @@ check_gstring (gstring)
 
 /* OTF handler */
 
+static void
+check_otf_features (otf_features)
+     Lisp_Object otf_features;
+{
+  Lisp_Object val, elt;
+
+  CHECK_CONS (otf_features);
+  CHECK_SYMBOL (XCAR (otf_features));
+  otf_features = XCDR (otf_features);
+  CHECK_CONS (otf_features);
+  CHECK_SYMBOL (XCAR (otf_features));
+  otf_features = XCDR (otf_features);
+  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
+    {
+      CHECK_SYMBOL (Fcar (val));
+      if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
+	error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val)));
+    }
+  otf_features = XCDR (otf_features);
+  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
+    {
+      CHECK_SYMBOL (Fcar (val));
+      if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
+	error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val)));
+    }
+}
+
 #ifdef HAVE_LIBOTF
 #include <otf.h>
 
@@ -1657,33 +1684,6 @@ adjust_anchor (struct font *font, OTF_Anchor *anchor,
     }
 }
 
-static void
-check_otf_features (otf_features)
-     Lisp_Object otf_features;
-{
-  Lisp_Object val, elt;
-
-  CHECK_CONS (otf_features);
-  CHECK_SYMBOL (XCAR (otf_features));
-  otf_features = XCDR (otf_features);
-  CHECK_CONS (otf_features);
-  CHECK_SYMBOL (XCAR (otf_features));
-  otf_features = XCDR (otf_features);
-  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
-    {
-      CHECK_SYMBOL (Fcar (val));
-      if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
-	error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val)));
-    }
-  otf_features = XCDR (otf_features);
-  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
-    {
-      CHECK_SYMBOL (Fcar (val));
-      if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
-	error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val)));
-    }
-}
-
 Lisp_Object
 font_otf_DeviceTable (device_table)
      OTF_DeviceTable *device_table;