1 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 27e430d7d0d..c43404fa438 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * 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  <eggert@cs.ucla.edu>
 
         * alloc.c: Use bool for booleans.