summaryrefslogtreecommitdiff
path: root/data.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:02 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:02 +0000
commit324cfb1744c2c3cc253dd0f63c2252206eb72249 (patch)
tree2765cce0a55cdbdd1a94e016469bdf8d086728c6 /data.h
parent632e8a138dd16efe41384a4335ec46530da4a04b (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'data.h')
-rw-r--r--data.h22
1 files changed, 7 insertions, 15 deletions
diff --git a/data.h b/data.h
index f174f8b..e006271 100644
--- a/data.h
+++ b/data.h
@@ -19,15 +19,18 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/programs/mkfontscale/data.h,v 1.2 2003/01/29 22:09:40 dawes Exp $ */
+/* $XFree86: xc/programs/mkfontscale/data.h,v 1.4 2003/07/08 15:39:49 tsi Exp $ */
+
+#ifndef _MKS_DATA_H_
+#define _MKS_DATA_H_ 1
/* Order is significant. For example, some B&H fonts are hinted by
URW++, and both strings appear in the notice. */
-char *notice_foundries[][2] =
+char *notice_foundries[][2] =
{{"Bigelow", "b&h"},
{"Adobe", "adobe"},
- {"Bitstream", "bitsteam"},
+ {"Bitstream", "bitstream"},
{"Monotype", "monotype"},
{"Linotype", "linotype"},
{"LINOTYPE-HELL", "linotype"},
@@ -76,16 +79,5 @@ char *vendor_foundries[][2] =
{"RICO", "ricoh"},
{"URW", "urw"},
{"Y&Y", "y&y"}};
-
-
-
-
-
-
-
-
-
-
-
-
+#endif /* _MKS_DATA_H_ */