summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-12-09 14:53:26 -0800
committerKeith Packard <keithp@keithp.com>2015-12-11 07:09:16 -0800
commit95a40553b8f12cd9479dd4b3c531e2069c53b870 (patch)
tree63f65fe2f9c3154e27cd28a5c8f2b0786bfd9b5d /include
parent903cd14547b445d7f40b52462750fc8b28441581 (diff)
Remove fontconf.h
This file used to advertise which font formats the library supports. The X server doesn't care, so let's just remove it so that it doesn't conflict with the older version of libXfont Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/X11/fonts/.gitignore2
-rw-r--r--include/X11/fonts/fontconf.h.in49
2 files changed, 0 insertions, 51 deletions
diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
deleted file mode 100644
index b571690..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add & Override for this directory and it's subdirectories
-fontconf.h
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in
deleted file mode 100644
index 67783d3..0000000
--- a/include/X11/fonts/fontconf.h.in
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2005 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Define as 1 if you have FreeType support in Xfont */
-#undef XFONT_FREETYPE
-
-/* Define as 1 if you have builtin font support in Xfont */
-#undef XFONT_BUILTINS
-
-/* Define as 1 if you have pcf font support in Xfont */
-#undef XFONT_PCFFORMAT
-
-/* Define as 1 if you have bdf font support in Xfont */
-#undef XFONT_BDFFORMAT
-
-/* Define as 1 if you have snf font support in Xfont */
-#undef XFONT_SNFFORMAT
-
-/* Define as 1 if you have bitmap font support in Xfont */
-#undef XFONT_BITMAP
-
-/* Define as 1 if you have fontfile support in Xfont */
-#undef XFONT_FONTFILE
-
-/* Define as 1 if you have font cache support in Xfont */
-#undef XFONT_FONTCACHE
-
-/* Define as 1 if you have X Font Services Protocol support in Xfont */
-#undef XFONT_FC
-