[Emacs-diffs] trunk r117504: * font.c, font.h (font_unparse_fcname): Now static.

[Paul Eggert]

------------------------------------------------------------
revno: 117504
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-07-09 16:35:31 -0700
message:
  * font.c, font.h (font_unparse_fcname): Now static.
  
  Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-09 10:36:35 +0000
+++ b/src/ChangeLog     2014-07-09 23:35:31 +0000
@@ -1,3 +1,8 @@
+2014-07-09  Paul Eggert  <address@hidden>
+
+       * font.c, font.h (font_unparse_fcname): Now static.
+       Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS.
+
 2014-07-09  Dmitry Antipov  <address@hidden>
 
        Next minor cleanup of font subsystem.

=== modified file 'src/font.c'
--- a/src/font.c        2014-07-08 14:50:45 +0000
+++ b/src/font.c        2014-07-09 23:35:31 +0000
@@ -227,6 +227,8 @@
 
 #if defined (HAVE_XFT) || defined (HAVE_FREETYPE) || defined (HAVE_NS)
 
+static int font_unparse_fcname (Lisp_Object, int, char *, int);
+
 /* Like above, but also set `type', `name' and `fullname' properties
    of font-object.  */
 
@@ -1599,11 +1601,14 @@
   return 0;
 }
 
+#if defined HAVE_XFT || defined HAVE_FREETYPE || defined HAVE_NS
+
 /* Store fontconfig's font name of FONT (font-spec or font-entity) in
    NAME (NBYTES length), and return the name length.  If
-   FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead.  */
+   FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead.
+   Return a negative value on error.  */
 
-int
+static int
 font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
 {
   Lisp_Object family, foundry;
@@ -1724,6 +1729,8 @@
   return (p - name);
 }
 
+#endif
+
 /* Parse NAME (null terminated) and store information in FONT
    (font-spec or font-entity).  If NAME is successfully parsed, return
    0.  Otherwise return -1.  */

=== modified file 'src/font.h'
--- a/src/font.h        2014-07-09 06:25:35 +0000
+++ b/src/font.h        2014-07-09 23:35:31 +0000
@@ -752,8 +752,6 @@
 extern int font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font);
 extern ptrdiff_t font_unparse_xlfd (Lisp_Object font, int pixel_size,
                                    char *name, int bytes);
-extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
-                                char *name, int bytes);
 extern void register_font_driver (struct font_driver *driver, struct frame *f);
 extern void free_font_driver_list (struct frame *f);
 #ifdef ENABLE_CHECKING