kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index fb6ee88..130f5e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-21  Werner Lemberg  <wl@gnu.org>
+
+	Work around a bug of the C 8.0.0.1 compiler on AIX 5.3 (#47955).
+
+	* include/freetype/internal/ftmemory.h (cplusplus_typeof): Use
+	braces for `extern "C++"'.
+
 2016-05-17  Nikolaus Waxweiler  <madigens@gmail.com>
 
 	[truetype] Make TT_LOADER_SET_PP support subpixel hinting [3/3].
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index 3157daf..8c06fc2 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -65,13 +65,15 @@ FT_BEGIN_HEADER
 
 #ifdef __cplusplus
 
-  extern "C++"
+extern "C++"
+{
   template <typename T> inline T*
   cplusplus_typeof(        T*,
                     void  *v )
   {
     return static_cast <T*> ( v );
   }
+}
 
 #define FT_ASSIGNP( p, val )  (p) = cplusplus_typeof( (p), (val) )