Module Name: xsrc
Committed By: mrg
Date: Sun Mar 3 09:27:12 UTC 2019
Modified Files:
xsrc/external/mit/mkfontscale/dist: list.c mkfontscale.c
Log Message:
protect config.h include with HAVE_CONFIG_H.
pass const char * to things wanting const not non-const.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/mkfontscale/dist/list.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/mkfontscale/dist/list.c
diff -u xsrc/external/mit/mkfontscale/dist/list.c:1.1.1.6 xsrc/external/mit/mkfontscale/dist/list.c:1.2
--- xsrc/external/mit/mkfontscale/dist/list.c:1.1.1.6 Sun Mar 3 09:16:10 2019
+++ xsrc/external/mit/mkfontscale/dist/list.c Sun Mar 3 09:27:12 2019
@@ -20,7 +20,9 @@
THE SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.7 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.8
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.7 Sun Mar 3 09:18:36 2019
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Sun Mar 3 09:27:12 2019
@@ -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 @@ static char *encodings_array[] =
"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;
