[Emacs-diffs] /srv/bzr/emacs/trunk r109743: * fontset.c (FONTSET_ADD): Return void, not Lisp_Object.

[Paul Eggert]

------------------------------------------------------------
revno: 109743
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-22 00:20:42 -0700
message:
  * 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.
modified:
  src/ChangeLog
  src/fontset.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-21 23:39:56 +0000
+++ b/src/ChangeLog     2012-08-22 07:20:42 +0000
@@ -1,3 +1,10 @@
+2012-08-22  Paul Eggert  <address@hidden>
+
+       * 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.
+
 2012-08-21  Paul Eggert  <address@hidden>
 
        * alloc.c: Use bool for booleans.

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2012-08-21 23:09:01 +0000
+++ b/src/fontset.c     2012-08-22 07:20:42 +0000
@@ -185,8 +185,7 @@
 
 
 /* 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 @@
    ? (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 @@
       set_fontset_fallback
        (fontset, NILP (args[idx]) ? args[1 - idx] : Fvconcat (2, args));
     }
-  return Qnil;
 }
 
 static int