diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-22 00:20:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-22 00:20:42 -0700 |
| commit | d733ec6d3d0b6524df9f5f5d9132ff430dd5dc01 (patch) | |
| tree | 7670aa5cd4887e596c2b5ff244109d276411038f /src/fontset.c | |
| parent | 80a51fa01ff36879aa57f82f90b796a2092e8191 (diff) | |
| download | emacs-d733ec6d3d0b6524df9f5f5d9132ff430dd5dc01.tar.gz | |
* fontset.c (FONTSET_ADD): Return void, not Lisp_Object.
Otherwise, the compiler complains about (A?B:C) where B is void
and C is Lisp_Object. This fixes an incompatibility with Sun C 5.12.
(fontset_add): Return void, for FONTSET_ADD.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/fontset.c b/src/fontset.c index f5eae58a01e..01e38fe45e5 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -185,8 +185,7 @@ void (*check_window_system_func) (void); /* Prototype declarations for static functions. */ -static Lisp_Object fontset_add (Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object); +static void fontset_add (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); static Lisp_Object fontset_find_font (Lisp_Object, int, struct face *, int, int); static void reorder_font_vector (Lisp_Object, struct font *); @@ -356,11 +355,12 @@ fontset_ref (Lisp_Object fontset, int c) ? (NILP (range) \ ? (set_fontset_fallback \ (fontset, Fmake_vector (make_number (1), (elt)))) \ - : Fset_char_table_range ((fontset), (range), \ - Fmake_vector (make_number (1), (elt)))) \ + : ((void) \ + Fset_char_table_range (fontset, range, \ + Fmake_vector (make_number (1), elt)))) \ : fontset_add ((fontset), (range), (elt), (add))) -static Lisp_Object +static void fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) { Lisp_Object args[2]; @@ -389,7 +389,6 @@ fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Objec set_fontset_fallback (fontset, NILP (args[idx]) ? args[1 - idx] : Fvconcat (2, args)); } - return Qnil; } static int |