[freetype2-demos] master 6d46d7c 1/2: * graph/*.*: Rearrange some headers.

[Alexei Podtelezhnikov]

branch: master
commit 6d46d7cb355bd2e25ad940ca8e1b646f8ab08256
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * graph/*.*: Rearrange some headers.
---
 ChangeLog             |  4 ++++
 graph/graph.h         |  2 +-
 graph/grconfig.h      | 44 --------------------------------------------
 graph/grtypes.h       | 45 +++++++++++++++++++++++++++++++++++++++++++++
 graph/win32/grwin32.c |  6 +++---
 graph/x11/grx11.c     |  2 ++
 graph/x11/grx11.h     |  1 -
 7 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 559f46b..058bd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-11-04  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       * graph/*.*: Rearrange some headers.
+
+2020-11-04  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        * src/ttdebug.c (Cur_U_Line, RunIns): Reset buffers explicitly.
 
 2020-11-04  Werner Lemberg  <wl@gnu.org>
diff --git a/graph/graph.h b/graph/graph.h
index 96b62ae..fbbc0e1 100644
--- a/graph/graph.h
+++ b/graph/graph.h
@@ -12,7 +12,7 @@
 #ifndef GRAPH_H_
 #define GRAPH_H_
 
-#include "grconfig.h"
+#include "grtypes.h"
 #include "grevents.h"
 
  /*************************************************************************/
diff --git a/graph/grconfig.h b/graph/grconfig.h
index c54c183..1ba102f 100644
--- a/graph/grconfig.h
+++ b/graph/grconfig.h
@@ -4,48 +4,4 @@
 #define GR_MAX_SATURATIONS  8
 #define GR_MAX_CONVERSIONS  16
 
-#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
-
-#include <stdint.h>
-
-#ifndef UINT32_MAX
-#error  "could not find a 32-bit integer type"
-#endif
-
-#else  /* old trick to determine 32-bit integer type */
-
-#include <limits.h>
-
-  /* The number of bytes in an `int' type.  */
-#if   UINT_MAX == 0xFFFFFFFFUL
-#define GR_SIZEOF_INT  4
-#elif UINT_MAX == 0xFFFFU
-#define GR_SIZEOF_INT  2
-#elif UINT_MAX > 0xFFFFFFFFU && UINT_MAX == 0xFFFFFFFFFFFFFFFFU
-#define GR_SIZEOF_INT  8
-#else
-#error "Unsupported number of bytes in `int' type!"
-#endif
-
-  /* The number of bytes in a `long' type.  */
-#if   ULONG_MAX == 0xFFFFFFFFUL
-#define GR_SIZEOF_LONG  4
-#elif ULONG_MAX > 0xFFFFFFFFU && ULONG_MAX == 0xFFFFFFFFFFFFFFFFU
-#define GR_SIZEOF_LONG  8
-#else
-#error "Unsupported number of bytes in `long' type!"
-#endif
-
-#if GR_SIZEOF_INT == 4
-typedef  int             int32_t;
-typedef  unsigned int    uint32_t;
-#elif GR_SIZEOF_LONG == 4
-typedef  long            int32_t;
-typedef  unsigned long   uint32_t;
-#else
-#error  "could not find a 32-bit integer type"
-#endif
-
-#endif  /* old trick to determine 32-bit integer type */
-
 #endif /* GRCONFIG_H_ */
diff --git a/graph/grtypes.h b/graph/grtypes.h
index 7327ee3..b4a8bc8 100644
--- a/graph/grtypes.h
+++ b/graph/grtypes.h
@@ -15,6 +15,51 @@
 #ifndef GRTYPES_H_
 #define GRTYPES_H_
 
+#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
+
+#include <stdint.h>
+
+#ifndef UINT32_MAX
+#error  "could not find a 32-bit integer type"
+#endif
+
+#else  /* old trick to determine 32-bit integer type */
+
+#include <limits.h>
+
+  /* The number of bytes in an `int' type.  */
+#if   UINT_MAX == 0xFFFFFFFFUL
+#define GR_SIZEOF_INT  4
+#elif UINT_MAX == 0xFFFFU
+#define GR_SIZEOF_INT  2
+#elif UINT_MAX > 0xFFFFFFFFU && UINT_MAX == 0xFFFFFFFFFFFFFFFFU
+#define GR_SIZEOF_INT  8
+#else
+#error "Unsupported number of bytes in `int' type!"
+#endif
+
+  /* The number of bytes in a `long' type.  */
+#if   ULONG_MAX == 0xFFFFFFFFUL
+#define GR_SIZEOF_LONG  4
+#elif ULONG_MAX > 0xFFFFFFFFU && ULONG_MAX == 0xFFFFFFFFFFFFFFFFU
+#define GR_SIZEOF_LONG  8
+#else
+#error "Unsupported number of bytes in `long' type!"
+#endif
+
+#if GR_SIZEOF_INT == 4
+  typedef  int             int32_t;
+  typedef  unsigned int    uint32_t;
+#elif GR_SIZEOF_LONG == 4
+  typedef  long            int32_t;
+  typedef  unsigned long   uint32_t;
+#else
+#error  "could not find a 32-bit integer type"
+#endif
+
+#endif  /* old trick to determine 32-bit integer type */
+
+
   typedef unsigned char  byte;
 
 #if 0
diff --git a/graph/win32/grwin32.c b/graph/win32/grwin32.c
index 5995265..85a6ebe 100644
--- a/graph/win32/grwin32.c
+++ b/graph/win32/grwin32.c
@@ -29,10 +29,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include <grobjs.h>
-#include <grdevice.h>
+#include "grobjs.h"
+#include "grdevice.h"
 #ifdef SWIZZLE
-#include <grswizzle.h>
+#include "grswizzle.h"
 #endif
 
 /* logging facility */
diff --git a/graph/x11/grx11.c b/graph/x11/grx11.c
index 1758ce6..a982a42 100644
--- a/graph/x11/grx11.c
+++ b/graph/x11/grx11.c
@@ -30,6 +30,8 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 
+#include "grtypes.h"
+#include "grobjs.h"
 #include "grx11.h"
 
 #define xxTEST
diff --git a/graph/x11/grx11.h b/graph/x11/grx11.h
index abb779f..7fa0e42 100644
--- a/graph/x11/grx11.h
+++ b/graph/x11/grx11.h
@@ -32,7 +32,6 @@
 #define Class  class
 #endif
 
-#include "grobjs.h"
 #include "grdevice.h"
 
   extern