kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index fd02647..bc39aca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-12-07  Werner Lemberg  <wl@gnu.org>
 
+	Fix C++ compilation.
+
+	* src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary.
+
+	* src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning.
+
+2017-12-07  Werner Lemberg  <wl@gnu.org>
+
 	Fix `make multi'.
 
 	* include/freetype/internal/fttrace.h: Remove unused tracing macros.
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
index bc1551e..2d851c8 100644
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -33,7 +33,10 @@ FT_BEGIN_HEADER
 #endif
 
 
+  FT_CALLBACK_TABLE
   const CFF_Builder_FuncsRec  cff_builder_funcs;
+
+  FT_CALLBACK_TABLE
   const PS_Builder_FuncsRec   ps_builder_funcs;
 
 
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 8262746..bccc54b 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -228,7 +228,7 @@
     if ( hmul )  /* lcd */
     {
       FT_Byte*  line;
-      FT_Byte*  temp;
+      FT_Byte*  temp = NULL;
       FT_UInt   i, j;
 
       unsigned int  height = bitmap->rows;