Update.

1998-06-18 10:26  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/Makefile (modules): Add MACINTOSH.
	(MACINTOSH-routines): New variable.
	(distribute): Add macintosh.c.
	(awk-generated-headers): Add macintosh.h.
	Add rule for macintosh.h generation.
	* iconvdata/gconv-modules: Add definitions for MACINTOSH.
	* iconvdata/macintosh.c: New file.

3 files changed, 41 insertions, 3 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index a1634cfb66..a300c10170 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -37,7 +37,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861	 \
 	   IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880	 \
 	   IBM918 IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254	 \
-	   CP1255 CP1256 CP1257 ISO-2022-JP
+	   CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -142,6 +142,7 @@ EUC-CN-routines := euccn
 EUC-TW-routines := euctw
 ISO-2022-JP-routines := iso-2022-jp
 ISO-2022-KR-routines := iso-2022-kr
+MACINTOSH-routines := macintosh
 libJIS-routines := jis0201 jis0208 jis0212
 libKSC-routines := ksc5601
 libGB-routines := gb2312
@@ -194,7 +195,7 @@ distribute := 8bit-generic.c 8bit-gap.c gap.awk gaptab.awk gconv-modules    \
 	      ibm1004.c ibm1026.c ibm1047.c cp1250.c cp1251.c cp1252.c	    \
 	      cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp874.c cp874.h  \
 	      cp737.c cp737.h cp775.c cp775.h iso-2022-jp.c iso-2022-kr.c   \
-	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh
+	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh macintosh.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -260,7 +261,7 @@ awk-generated-headers  := koi8-r.h latin-greek.h latin-greek-1.h	 \
 			  ibm1026.h cp1250.h cp1251.h cp1252.h cp1253.h	 \
 			  cp1254.h cp1255.h cp1256.h cp1257.h		 \
 			  iso8859-5.h iso8859-7.h iso8859-8.h		 \
-			  iso8859-10.h iso8859-7jp.h
+			  iso8859-10.h iso8859-7jp.h macintosh.h
 
 generated = $(sed-generated-headers) $(sed-generated-headers:%.h=%.stmp) \
 	    $(awk-generated-headers) $(awk-generated-headers:%.h=%.stmp) \
@@ -458,6 +459,9 @@ $(objpfx)cp1256.stmp: ../localedata/charmaps/CP1256 gen-8bit-gap.sh
 $(objpfx)cp1257.stmp: ../localedata/charmaps/CP1257 gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
 
+$(objpfx)macintosh.stmp: ../localedata/charmaps/MACINTOSH gen-8bit-gap.sh
+	$(generate-8bit-gap-table)
+
 headers: $(addprefix $(objpfx),\
 		$(sed-generated-headers) $(awk-generated-headers))
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 6f206fa316..ee665285ba 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -812,3 +812,8 @@ module	INTERNAL		ISO-2022-JP-2//		ISO-2022-JP	1
 #	from			  to			module		cost
 module	ISO-2022-KR//		INTERNAL		ISO-2022-KR	1
 module	INTERNAL		ISO-2022-KR//		ISO-2022-KR	1
+
+#	from			  to			module		cost
+alias	MAC//			MACINTOSH//
+module	MACINTOSH//		INTERNAL		MACINTOSH	1
+module	INTERNAL		MACINTOSH//		MACINTOSH	1
diff --git a/iconvdata/macintosh.c b/iconvdata/macintosh.c
new file mode 100644
index 0000000000..fba1cbdc97
--- /dev/null
+++ b/iconvdata/macintosh.c
@@ -0,0 +1,29 @@
+/* Conversion from and to MACINTOSH.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <macintosh.h>
+
+#define CHARSET_NAME	"MACINTOSH//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>