Module Name: xsrc
Committed By: mrg
Date: Mon Mar 17 09:01:38 UTC 2014
Modified Files:
xsrc/external/mit/mkfontscale/dist: hash.c mkfontscale.c
Added Files:
xsrc/external/mit/mkfontscale/include: config.h
Log Message:
merge mkfontscale 1.1.1 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/mkfontscale/dist/hash.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/mkfontscale/include/config.h
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/hash.c
diff -u xsrc/external/mit/mkfontscale/dist/hash.c:1.1.1.3 xsrc/external/mit/mkfontscale/dist/hash.c:1.2
--- xsrc/external/mit/mkfontscale/dist/hash.c:1.1.1.3 Mon Mar 17 08:48:41 2014
+++ xsrc/external/mit/mkfontscale/dist/hash.c Mon Mar 17 09:01:38 2014
@@ -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.3 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.4
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.3 Mon Mar 17 08:51:28 2014
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Mon Mar 17 09:01:38 2014
@@ -20,7 +20,9 @@
THE SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <stdio.h>
#include <stdlib.h>
Added files:
Index: xsrc/external/mit/mkfontscale/include/config.h
diff -u /dev/null xsrc/external/mit/mkfontscale/include/config.h:1.1
--- /dev/null Mon Mar 17 09:01:38 2014
+++ xsrc/external/mit/mkfontscale/include/config.h Mon Mar 17 09:01:38 2014
@@ -0,0 +1,106 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+#define HAVE_LIBBZ2 1
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "mkfontscale"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg";
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "mkfontscale"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "mkfontscale 1.1.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "mkfontscale"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.1.1"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 1
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 1
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
+#define VERSION "1.1.1"
+
+/* Support bzip2 for bitmap fonts */
+#define X_BZIP2_FONT_COMPRESSION 1
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
