summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mkfontscale.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/mkfontscale.c b/mkfontscale.c
index 6b6b86b..dce41b6 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -19,8 +19,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.19 2003/11/23 05:40:36 dawes Exp $ */
-/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.19 2003/11/23 05:40:36 dawes Exp $ */
+/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.2 2003/12/06 13:24:29 kaleb Exp $ */
+/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.22 2003/12/19 02:05:39 dawes Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <errno.h>
+#include <X11/Xos.h>
#include <X11/fonts/fontenc.h>
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -46,6 +47,12 @@
#include "data.h"
#include "ident.h"
+#ifdef NEED_SNPRINTF
+#undef SCOPE
+#define SCOPE static
+#include "snprintf.c"
+#endif
+
#define NPREFIX 1024
#ifndef MAXFONTFILENAMELEN
@@ -63,6 +70,7 @@ char *encodings_array[] =
"iso8859-15", "iso8859-16",
"ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
"tis620-2",
+ "sun.unicode.india-0",
"adobe-standard", "adobe-symbol",
"ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
/* But not "adobe-dingbats", as it uses generic glyph names. */