diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-16 10:05:53 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-16 10:05:53 -0800 |
| commit | 32779713e1a809d0e85efcc90677b7a029fbf69b (patch) | |
| tree | 3867aa71f97eaad426a085d6b8a0514f4f665600 /src/font.h | |
| parent | d865f6b5554c6adf04f0786b821ba4c07c12d48d (diff) | |
| download | emacs-32779713e1a809d0e85efcc90677b7a029fbf69b.tar.gz | |
* 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.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/font.h b/src/font.h index 8fb80a9b617..a4fa3c2cf42 100644 --- a/src/font.h +++ b/src/font.h @@ -25,6 +25,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 register_font_driver (struct font_driver *driver, struct frame *f); 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 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object); font_deferred_log ((ACTION), (ARG), (RESULT)); \ } while (false) +INLINE_HEADER_END + #endif /* not EMACS_FONT_H */ |