From a0f918d1f14cd1dc1feb445310e807b61fa51f01 Mon Sep 17 00:00:00 2001
From: Priyeshkkumar <priyeshkkumar@gmail.com>
Date: Wed, 22 Jul 2020 19:46:14 +0530
Subject: [PATCH] Minor Changes

---
 [priyesh]ChangeLog                  | 4 ++++
 builds/unix/unix-cc.in              | 2 +-
 include/freetype/internal/ftdebug.h | 4 ++--
 src/dlg/rules.mk                    | 2 --
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[priyesh]ChangeLog b/[priyesh]ChangeLog
index 07217c434..e2f5f2a4a 100644
--- a/[priyesh]ChangeLog
+++ b/[priyesh]ChangeLog
@@ -1,5 +1,9 @@
 2020-07-22  Priyesh Kumar   <priyeshkkumar@gmail.com>
 
+    * Reverted back to `-std=c99' flag in `unix-cc.in'
+
+    * Updated dlg's include path in `include/freetype/internal/ftdebug.h'.
+
     * Changed `builds/toplevel.mk' and `autogen.sh' to copy dlg's include
       files from `submodules/dlg' to `src/dlg/dlg' due to include path errors
       on windows.
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 30d097b23..6dbf399b6 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -79,7 +79,7 @@ T := -o$(space)
 #   We use our own FreeType configuration files overriding defaults.
 #
 CPPFLAGS := @CPPFLAGS@
-CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ \
+CFLAGS   := -c -std=c99 @XX_CFLAGS@ @CFLAGS@ \
             $DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
             $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
             $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 6ce0e0715..d00040f5e 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -37,8 +37,8 @@
    */ 
                                                                       
 #ifdef FT_LOGGING
-#include <../src/dlg/dlg.h>
-#include <../src/dlg/output.h>
+#include <../src/dlg/dlg/dlg.h>
+#include <../src/dlg/dlg/output.h>
 #include <freetype/ftlogging.h>
 #endif /* FT_LOGGING */
 
diff --git a/src/dlg/rules.mk b/src/dlg/rules.mk
index 3c8f652a6..cf91debaa 100644
--- a/src/dlg/rules.mk
+++ b/src/dlg/rules.mk
@@ -17,8 +17,6 @@
 #
 DLG_DIR := $(SRC_DIR)/dlg
 
-FT_CFLAGS += -std=c99
-
 DLG_COMPILE := $(CC) $(ANSIFLAGS)                            \
                      $I$(subst /,$(COMPILER_SEP),$(DLG_DIR)) \
                      $(INCLUDE_FLAGS)                        \