Rename font_driver member close -> close_font

* src/alloc.c (cleanup_vector):
* src/xftfont.c (xftfont_driver):
* src/xfont.c (xfont_driver):
* src/nsfont.m (nsfont_driver):
* src/macfont.m (macfont_driver):
* src/ftxfont.c (ftxfont_driver):
* src/ftfont.c (ftfont_driver):
* src/ftcrfont.c (ftcrfont_driver):
* src/font.h (struct font_driver):
* src/font.c (font_clear_cache, font_close_object):
Rename `close' member to `close_font', to avoid clash with preprocessor
define of `close' in nt/inc/ms-w32.h and for consistency with `open_font'.

diff --git a/src/alloc.c b/src/alloc.c
index 90817da5974635367d6a5f28908fd49e6739d986..833176d4e90d97ed1d8b743806c619a7e49c692f 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3019,7 +3019,7 @@ cleanup_vector (struct Lisp_Vector *vector)
            {
              /* Attempt to catch subtle bugs like Bug#16140.  */
              eassert (valid_font_driver (drv));
-             drv->close (font);
+             drv->close_font (font);
            }
        }
     }

diff --git a/src/font.c b/src/font.c
index 5b10fb2a1586be3a44ae5923b99bb95464a35ee1..ce85e0bb4ad5af71996560c8a0719ff5dae58243 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -2642,7 +2642,7 @@ font_clear_cache (struct frame *f, Lisp_Object cache,
                      if (! NILP (AREF (val, FONT_TYPE_INDEX)))
                        {
                          eassert (font && driver == font->driver);
-                         driver->close (font);
+                         driver->close_font (font);
                        }
                    }
                  if (driver->free_entity)
@@ -2962,7 +2962,7 @@ font_close_object (struct frame *f, Lisp_Object font_object)
     /* Already closed.  */
     return;
   FONT_ADD_LOG ("close", font_object, Qnil);
-  font->driver->close (font);
+  font->driver->close_font (font);
 #ifdef HAVE_WINDOW_SYSTEM
   eassert (FRAME_DISPLAY_INFO (f)->n_fonts);
   FRAME_DISPLAY_INFO (f)->n_fonts--;

diff --git a/src/font.h b/src/font.h
index e59fc1d1b250b42e5853c7cc023837812dade1f3..9d4b2d81c6fe5cc121e167a93b33366d5447f4f6 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -627,7 +627,7 @@ struct font_driver
                             int pixel_size);
 
   /* Close FONT.  NOTE: this can be called by GC.  */
-  void (*close) (struct font *font);
+  void (*close_font) (struct font *font);
 
   /* Prepare FACE for displaying characters by FONT on frame F by
      storing some data in FACE->extra.  */

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 24a4242c89b54ed016550dc959d4ef9e928955e4..f0c7cbb8c86c97f553ceb452bb12ca6e5c744dcc 100644 (file)
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -577,7 +577,7 @@ struct font_driver const ftcrfont_driver =
   .match = ftcrfont_match,
   .list_family = ftfont_list_family,
   .open_font = ftcrfont_open,
-  .close = ftcrfont_close,
+  .close_font = ftcrfont_close,
   .has_char = ftcrfont_has_char,
   .encode_char = ftcrfont_encode_char,
   .text_extents = ftcrfont_text_extents,

diff --git a/src/ftfont.c b/src/ftfont.c
index 52a3b3884986b09b77abb61cd9dba0db1204192a..16b18de6867af8f7e6c86aeefb1553e250ef334c 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -3040,7 +3040,7 @@ static struct font_driver const ftfont_driver =
   .match = ftfont_match,
   .list_family = ftfont_list_family,
   .open_font = ftfont_open,
-  .close = ftfont_close,
+  .close_font = ftfont_close,
   .has_char = ftfont_has_char,
   .encode_char = ftfont_encode_char,
   .text_extents = ftfont_text_extents,

diff --git a/src/ftxfont.c b/src/ftxfont.c
index 81b725559083381890ddb5b5be5faed04703e3cd..1d1bd2c4581e3c857cbefe159d6baa3fa22ff0c1 100644 (file)
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -336,7 +336,7 @@ struct font_driver const ftxfont_driver =
   .match = ftxfont_match,
   .list_family = ftfont_list_family,
   .open_font = ftxfont_open,
-  .close = ftxfont_close,
+  .close_font = ftxfont_close,
   .has_char = ftfont_has_char,
   .encode_char = ftfont_encode_char,
   .text_extents = ftfont_text_extents,

diff --git a/src/macfont.m b/src/macfont.m
index 26a4a553503838cf5412b75116b5e8bb90d09b43..301951f34a57603858868a2abdf6e5fd876ec913 100644 (file)
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -1664,7 +1664,7 @@ static struct font_driver macfont_driver =
   .list_family = macfont_list_family,
   .free_entity = macfont_free_entity,
   .open_font = macfont_open,
-  .close = macfont_close,
+  .close_font = macfont_close,
   .has_char = macfont_has_char,
   .encode_char = macfont_encode_char,
   .text_extents = macfont_text_extents,

diff --git a/src/nsfont.m b/src/nsfont.m
index df582024bdcfb1f1faf85c5d57cad666dff9752f..7a40d672b5d1c8deb6c7e9997d16c899ee44cf04 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1492,7 +1492,7 @@ struct font_driver const nsfont_driver =
   .match = nsfont_match,
   .list_family = nsfont_list_family,
   .open_font = nsfont_open,
-  .close = nsfont_close,
+  .close_font = nsfont_close,
   .has_char = nsfont_has_char,
   .encode_char = nsfont_encode_char,
   .text_extents = nsfont_text_extents,

diff --git a/src/xfont.c b/src/xfont.c
index f6cd2eda5f512ce9a575da718da1462eaa61c7f7..e7a0cb2277d652d857822a234077ba128f215a45 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1107,7 +1107,7 @@ struct font_driver const xfont_driver =
   .match = xfont_match,
   .list_family = xfont_list_family,
   .open_font = xfont_open,
-  .close = xfont_close,
+  .close_font = xfont_close,
   .prepare_face = xfont_prepare_face,
   .has_char = xfont_has_char,
   .encode_char = xfont_encode_char,

diff --git a/src/xftfont.c b/src/xftfont.c
index 3ce4b15da8159e763d1e7295c994e630cc9c79f2..e0035808172871d3ddd26a1da8dd7721fe9b5e9d 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -644,7 +644,7 @@ struct font_driver const xftfont_driver =
   .match = xftfont_match,
   .list_family = ftfont_list_family,
   .open_font = xftfont_open,
-  .close = xftfont_close,
+  .close_font = xftfont_close,
   .prepare_face = xftfont_prepare_face,
   .done_face = xftfont_done_face,
   .has_char = xftfont_has_char,