[freetype2-demos] master 6ef15ce: Synchronize with recent FreeType changes.

[Werner LEMBERG]

branch: master
commit 6ef15ce5aecc089fda7f943b01dcedeb72ad6229
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    Synchronize with recent FreeType changes.
    
    * mac/ftoldmac.c, src/ftbench.c, src/ftchkwd.c, src/ftcommon.c:
    Include `compiler-macros.h', which now contains the definition of
    `FT_UNUSED'.
---
 ChangeLog      | 8 ++++++++
 mac/ftoldmac.c | 1 +
 src/ftbench.c  | 3 +++
 src/ftchkwd.c  | 3 +++
 src/ftcommon.c | 3 +++
 5 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 93b00d3..e225105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-07-06  Werner Lemberg  <wl@gnu.org>
+
+       Synchronize with recent FreeType changes.
+
+       * mac/ftoldmac.c, src/ftbench.c, src/ftchkwd.c, src/ftcommon.c:
+       Include `compiler-macros.h', which now contains the definition of
+       `FT_UNUSED'.
+
 2020-06-25  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        * src/ftstring.c (event_color_change): Cycle color by luminance.
diff --git a/mac/ftoldmac.c b/mac/ftoldmac.c
index 04a97c4..2c94b7a 100644
--- a/mac/ftoldmac.c
+++ b/mac/ftoldmac.c
@@ -30,6 +30,7 @@
 
   /* the following header shouldn't be used in normal programs */
 #include <freetype/internal/ftdebug.h>
+#include <freetype/internal/compiler-macros.h>
 
   /* showing driver name */
 #include FT_MODULE_H
diff --git a/src/ftbench.c b/src/ftbench.c
index 0f72bfd..58a7741 100644
--- a/src/ftbench.c
+++ b/src/ftbench.c
@@ -35,6 +35,9 @@
 #include FT_DRIVER_H
 #include FT_LCD_FILTER_H
 
+  /* the following header shouldn't be used in normal programs */
+#include <freetype/internal/compiler-macros.h>
+
 #ifdef UNIX
 #include <unistd.h>
 #else
diff --git a/src/ftchkwd.c b/src/ftchkwd.c
index 961ef59..3061711 100644
--- a/src/ftchkwd.c
+++ b/src/ftchkwd.c
@@ -15,6 +15,9 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+  /* the following header shouldn't be used in normal programs */
+#include <freetype/internal/compiler-macros.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 48c0d9b..14a3aaa 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -25,6 +25,9 @@
 #include FT_BITMAP_H
 #include FT_FONT_FORMATS_H
 
+  /* the following header shouldn't be used in normal programs */
+#include <freetype/internal/compiler-macros.h>
+
   /* error messages */
 #undef FTERRORS_H_
 #define FT_ERROR_START_LIST     {