[freetype2-demos] master f1d7886: */*: Include internal headers by their real names.

[Werner LEMBERG]

branch: master
commit f1d78861d13c4b2324274f8d8ac187c8d0a9624c
Author: David Turner <david.turner.dev@gmail.com>
Commit: Werner Lemberg <wl@gnu.org>

    */*: Include internal headers by their real names.
    
    The FT_INTERNAL_XXX_H macros are going to disappear.
---
 ChangeLog                       | 6 ++++++
 mac/ftoldmac.c                  | 6 +++---
 src/compos.c                    | 2 +-
 src/ftdiff.c                    | 4 ++--
 src/ftdump.c                    | 6 +++---
 src/ftgrid.c                    | 6 +++---
 src/ftinspect/engine/engine.cpp | 4 ++--
 src/ftvalid.c                   | 8 ++++----
 src/ftview.c                    | 6 +++---
 9 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33a5c6b..9d9ea39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-11  David Turner  <david@freetype.org>
+
+       */*: Include internal headers by their real names.
+
+       The FT_INTERNAL_XXX_H macros are going to disappear.
+
 2020-06-09  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        * graph/x11/grx11.c (gr_x11_surface_listen_event): No need to flush.
diff --git a/mac/ftoldmac.c b/mac/ftoldmac.c
index 8b02f85..04a97c4 100644
--- a/mac/ftoldmac.c
+++ b/mac/ftoldmac.c
@@ -29,12 +29,12 @@
 #include FT_TRUETYPE_IDS_H
 
   /* the following header shouldn't be used in normal programs */
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/internal/ftdebug.h>
 
   /* showing driver name */
 #include FT_MODULE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DRIVER_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdrv.h>
 
   /* FSSpec functions are deprecated since Mac OS X 10.4 */
 #ifndef HAVE_FSSPEC
diff --git a/src/compos.c b/src/compos.c
index 1b76ae3..7d5d19c 100644
--- a/src/compos.c
+++ b/src/compos.c
@@ -17,7 +17,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_INTERNAL_GLYPH_LOADER_H
+#include <freetype/internal/internal/ftgloadr.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/ftdiff.c b/src/ftdiff.c
index 0984886..69ae197 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -24,8 +24,8 @@
   /* showing driver name -- the two internal header files */
   /* shouldn't be used in normal programs                 */
 #include FT_MODULE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DRIVER_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdrv.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/ftdump.c b/src/ftdump.c
index 4abe35c..b87955b 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -17,12 +17,12 @@
 #include FT_MULTIPLE_MASTERS_H
 
   /* the following header shouldn't be used in normal programs */
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/internal/ftdebug.h>
 
   /* showing driver name */
 #include FT_MODULE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DRIVER_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdrv.h>
 
   /* error messages */
 #undef FTERRORS_H_
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 9561498..3313e79 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -20,12 +20,12 @@
 #include <stdlib.h>
 
   /* the following header shouldn't be used in normal programs */
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/internal/ftdebug.h>
 
   /* showing driver name */
 #include FT_MODULE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DRIVER_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdrv.h>
 
 #include FT_STROKER_H
 #include FT_SYNTHESIS_H
diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index b770846..d8bb903 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -13,8 +13,8 @@
 #include FT_LCD_FILTER_H
 
 // internal FreeType header files; only available in the source code bundle
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_OBJECTS_H
+#include <freetype/internal/ftdrv.h>
+#include <freetype/internal/ftobjs.h>
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/ftvalid.c b/src/ftvalid.c
index b4474ff..c8bae7d 100644
--- a/src/ftvalid.c
+++ b/src/ftvalid.c
@@ -26,10 +26,10 @@
 #include FT_GX_VALIDATE_H
 
   /* the following four header files shouldn't be used in normal programs */
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_VALIDATE_H
-#include FT_INTERNAL_MEMORY_H
-#include FT_INTERNAL_OBJECTS_H
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftvalid.h>
+#include <freetype/internal/ftmemory.h>
+#include <freetype/internal/ftobjs.h>
 
 #include "common.h"
 #include "mlgetopt.h"
diff --git a/src/ftview.c b/src/ftview.c
index 35aafff..0d5e249 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -22,12 +22,12 @@
 #include <stdio.h>
 
   /* the following header shouldn't be used in normal programs */
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/internal/ftdebug.h>
 
   /* showing driver name */
 #include FT_MODULE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DRIVER_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdrv.h>
 
 #include FT_STROKER_H
 #include FT_SYNTHESIS_H