[Emacs-diffs] trunk r115550: * font.h (valid_font_driver) [!ENABLE_CHECKING]: Define a dummy.

[Paul Eggert]

------------------------------------------------------------
revno: 115550
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-16 10:05:53 -0800
message:
  * font.h (valid_font_driver) [!ENABLE_CHECKING]: Define a dummy.
  
  This prevents a compilation error on C compilers that do not
  default functions to return 'int' if not declared.  Also, add
  INLINE_HEADER_BEGIN and INLINE_HEADER_END to this include file,
  since it now uses inline functions.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-16 17:59:50 +0000
+++ b/src/ChangeLog     2013-12-16 18:05:53 +0000
@@ -1,3 +1,11 @@
+2013-12-16  Paul Eggert  <address@hidden>
+
+       * font.h (valid_font_driver) [!ENABLE_CHECKING]: Define a dummy.
+       This prevents a compilation error on C compilers that do not
+       default functions to return 'int' if not declared.  Also, add
+       INLINE_HEADER_BEGIN and INLINE_HEADER_END to this include file,
+       since it now uses inline functions.
+
 2013-12-16  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (extend_face_to_end_of_line): Don't fill background of

=== modified file 'src/font.h'
--- a/src/font.h        2013-12-16 07:45:33 +0000
+++ b/src/font.h        2013-12-16 18:05:53 +0000
@@ -25,6 +25,8 @@
 #include "ccl.h"
 #include "frame.h"
 
+INLINE_HEADER_BEGIN
+
 /* We have three types of Lisp objects related to font.
 
    FONT-SPEC
@@ -789,6 +791,12 @@
 extern void free_font_driver_list (struct frame *f);
 #ifdef ENABLE_CHECKING
 extern bool valid_font_driver (struct font_driver *);
+#else
+INLINE bool
+valid_font_driver (struct font_driver *d)
+{
+  return true;
+}
 #endif
 extern Lisp_Object font_update_drivers (struct frame *f, Lisp_Object list);
 extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *,
@@ -862,4 +870,6 @@
       font_deferred_log ((ACTION), (ARG), (RESULT));   \
   } while (false)
 
+INLINE_HEADER_END
+
 #endif /* not EMACS_FONT_H */