[freetype2-demos] master 28ef9ec: Don't use `aux' as a file name.

[Werner LEMBERG]

branch: master
commit 28ef9ecca0a4e5d4bf6022010e4ff7d423bf16e8
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Don't use `aux' as a file name.
    
    This should be avoided under Windows.
    Problem reported by Dave Arnold <address@hidden>.
    
    * src/aux.c, src/aux.h: Renamed to...
    * src/output.c, src/output.h: ... these file names.
    
    * Makefile, src/ftdump.c, src/ftgrid.c: Updated.
---
 ChangeLog               |   12 ++++++++++++
 Makefile                |    4 ++--
 src/ftdump.c            |    2 +-
 src/ftgrid.c            |    2 +-
 src/{aux.c => output.c} |   13 ++-----------
 src/{aux.h => output.h} |   17 ++++-------------
 6 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c94061e..3262c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-10-16  Werner Lemberg  <address@hidden>
+
+       Don't use `aux' as a file name.
+
+       This should be avoided under Windows.
+       Problem reported by Dave Arnold <address@hidden>.
+
+       * src/aux.c, src/aux.h: Renamed to...
+       * src/output.c, src/output.h: ... these file names.
+
+       * Makefile, src/ftdump.c, src/ftgrid.c: Updated.
+
 2015-10-04  Werner Lemberg  <address@hidden>
 
        * Version 2.6.1 released.
diff --git a/Makefile b/Makefile
index 22fc673..83fe6d6 100644
--- a/Makefile
+++ b/Makefile
@@ -319,9 +319,9 @@ else
   # Rules for compiling object files for text-only demos.
   #
   $(OBJ_DIR_2)/common.$(SO): $(SRC_DIR)/common.c
-  $(OBJ_DIR_2)/aux.$(SO): $(SRC_DIR)/aux.c
+  $(OBJ_DIR_2)/output.$(SO): $(SRC_DIR)/output.c
   COMMON_OBJ := $(OBJ_DIR_2)/common.$(SO) \
-                $(OBJ_DIR_2)/aux.$(SO)
+                $(OBJ_DIR_2)/output.$(SO)
 
 
   FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO)
diff --git a/src/ftdump.c b/src/ftdump.c
index d7ef68f..3676bab 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -24,7 +24,7 @@
 #include FT_INTERNAL_DRIVER_H
 
 #include "common.h"
-#include "aux.h"
+#include "output.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/ftgrid.c b/src/ftgrid.c
index ea8b0af..d0ac252 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -15,7 +15,7 @@
 
 #include "ftcommon.h"
 #include "common.h"
-#include "aux.h"
+#include "output.h"
 #include <math.h>
 
   /* the following header shouldn't be used in normal programs */
diff --git a/src/aux.c b/src/output.c
similarity index 92%
rename from src/aux.c
rename to src/output.c
index c468619..c1e6d51 100644
--- a/src/aux.c
+++ b/src/output.c
@@ -6,21 +6,12 @@
 /*  D. Turner, R.Wilhelm, and W. Lemberg                                    */
 /*                                                                          */
 /*                                                                          */
-/*  aux.c - auxiliary routines for the FreeType demo programs.              */
+/*  output.c - string output routines for the FreeType demo programs.       */
 /*                                                                          */
 /****************************************************************************/
 
 
-#include "aux.h"
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    STRING OUTPUT FUNCTIONS                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
+#include "output.h"
 
 
   static char hexdigit[16] = {
diff --git a/src/aux.h b/src/output.h
similarity index 73%
rename from src/aux.h
rename to src/output.h
index 215fca8..94ba01a 100644
--- a/src/aux.h
+++ b/src/output.h
@@ -6,28 +6,19 @@
 /*  D. Turner, R.Wilhelm, and W. Lemberg                                    */
 /*                                                                          */
 /*                                                                          */
-/*  aux.h - auxiliary routines for the FreeType demo programs.              */
+/*  output.h - string output routines for the FreeType demo programs.       */
 /*                                                                          */
 /****************************************************************************/
 
 
-#ifndef _AUX_H_
-#define _AUX_H_
+#ifndef _OUTPUT_H_
+#define _OUTPUT_H_
 
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    STRING OUTPUT FUNCTIONS                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
   void
   put_ascii_string( char*     out,
                     FT_Byte*  string,
@@ -65,6 +56,6 @@
                     FT_Int    as_utf8 );
 
 
-#endif /* _AUX_H_ */
+#endif /* _OUTPUT_H_ */
 
 /* End */