[freetype2] master f0ed30e: Fix C++ compilation (#45762).

[Werner LEMBERG]

branch: master
commit f0ed30e6e6979f92ffa68e9791cba3ad0f57c162
Author: pazer <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix C++ compilation (#45762).
    
    * src/base/ftstroke.c (ft_outline_glyph_class): Use
    FT_CALLBACK_TABLE.
---
 ChangeLog           |    7 +++++++
 src/base/ftstroke.c |   19 ++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45196e0..89249f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-15  pazer  <address@hidden>
+
+       Fix C++ compilation (#45762).
+
+       * src/base/ftstroke.c (ft_outline_glyph_class): Use
+       FT_CALLBACK_TABLE.
+
 2015-08-14  Alexei Podtelezhnikov  <address@hidden>
 
        [truetype] Clean up.
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 842ee30..fecb3cc 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -24,6 +24,16 @@
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_OBJECTS_H
 
+#include "basepic.h"
+
+
+  /* declare an extern to access `ft_outline_glyph_class' globally     */
+  /* allocated  in `ftglyph.c', and use the FT_OUTLINE_GLYPH_CLASS_GET */
+  /* macro to access it when FT_CONFIG_OPTION_PIC is defined           */
+#ifndef FT_CONFIG_OPTION_PIC
+  FT_CALLBACK_TABLE const FT_Glyph_Class  ft_outline_glyph_class;
+#endif
+
 
   /* documentation is in ftstroke.h */
 
@@ -2285,15 +2295,6 @@
   }
 
 
-  /* declare an extern to access `ft_outline_glyph_class' globally     */
-  /* allocated  in `ftglyph.c', and use the FT_OUTLINE_GLYPH_CLASS_GET */
-  /* macro to access it when FT_CONFIG_OPTION_PIC is defined           */
-#ifndef FT_CONFIG_OPTION_PIC
-  extern const FT_Glyph_Class  ft_outline_glyph_class;
-#endif
-#include "basepic.h"
-
-
   /* documentation is in ftstroke.h */
 
   FT_EXPORT_DEF( FT_Error )