[xsrc/trunk]: xsrc/external/mit/mkfontscale/dist protect config.h include wit...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/4416ea8cd8d2
branches:  trunk
changeset: 10146:4416ea8cd8d2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 03 09:27:12 2019 +0000

description:
protect config.h include with HAVE_CONFIG_H.
pass const char * to things wanting const not non-const.

diffstat:

 external/mit/mkfontscale/dist/list.c        |  2 ++
 external/mit/mkfontscale/dist/mkfontscale.c |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 8e7cb977bfcc -r 4416ea8cd8d2 external/mit/mkfontscale/dist/list.c
--- a/external/mit/mkfontscale/dist/list.c      Sun Mar 03 09:18:36 2019 +0000
+++ b/external/mit/mkfontscale/dist/list.c      Sun Mar 03 09:27:12 2019 +0000
@@ -20,7 +20,9 @@
   THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff -r 8e7cb977bfcc -r 4416ea8cd8d2 external/mit/mkfontscale/dist/mkfontscale.c
--- a/external/mit/mkfontscale/dist/mkfontscale.c       Sun Mar 03 09:18:36 2019 +0000
+++ b/external/mit/mkfontscale/dist/mkfontscale.c       Sun Mar 03 09:27:12 2019 +0000
@@ -67,7 +67,7 @@
 #define QUOTE(x)       #x
 #define STRINGIFY(x)   QUOTE(x)
 
-static char *encodings_array[] =
+static const char *encodings_array[] =
     { "ascii-0",
       "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
       "iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
@@ -86,7 +86,7 @@
       "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
       "ksc5601.1987-0", "ksc5601.1992-3"};
 
-static char *extra_encodings_array[] =
+static const char *extra_encodings_array[] =
     { "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
 
 static ConstListPtr encodings, extra_encodings;