diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
| commit | 932edb23b47440397447265bf72ad7932fd80070 (patch) | |
| tree | 16cda22a6b6b9e9a8ca05a9946dc66f4edf34293 /src/FreeType | |
| parent | b03d67fd1612a0df5132b10dd0bd9b2cec053a39 (diff) | |
| download | xorg-lib-libXfont-932edb23b47440397447265bf72ad7932fd80070.tar.gz | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'src/FreeType')
| -rw-r--r-- | src/FreeType/ftenc.c | 8 | ||||
| -rw-r--r-- | src/FreeType/ftfuncs.c | 10 | ||||
| -rw-r--r-- | src/FreeType/fttools.c | 2 | ||||
| -rw-r--r-- | src/FreeType/xttcap.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c index 1f75d80..dcd626a 100644 --- a/src/FreeType/ftenc.c +++ b/src/FreeType/ftenc.c @@ -29,12 +29,12 @@ THE SOFTWARE. #include "xf86_ansic.h" #endif -#include "fntfilst.h" -#include "fontutil.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> #include <X11/fonts/FSproto.h> -#include "fontmisc.h" -#include "fontenc.h" +#include <X11/fonts/fontmisc.h> +#include <X11/fonts/fontenc.h> #include <ft2build.h> #include FT_FREETYPE_H #include FT_TRUETYPE_IDS_H diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 6cdff76..769a27a 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -25,11 +25,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.8 2004/11/02 08:54:52 eich Exp $ */ +/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.10 2005/05/27 17:44:07 josh Exp $ */ /* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #ifndef FONTMODULE #include <string.h> @@ -40,8 +40,8 @@ THE SOFTWARE. #include "xf86_ansic.h" #endif -#include "fntfilst.h" -#include "fontutil.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> #include <X11/fonts/FSproto.h> #include <ft2build.h> #include FT_FREETYPE_H @@ -64,7 +64,7 @@ THE SOFTWARE. #include FT_OUTLINE_H #endif -#include "fontenc.h" +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" #include "xttcap.h" diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c index b604771..8302778 100644 --- a/src/FreeType/fttools.c +++ b/src/FreeType/fttools.c @@ -23,7 +23,7 @@ /* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */ -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #ifndef FONTMODULE #include <ctype.h> #include <string.h> diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c index 1e2d566..b6e2a24 100644 --- a/src/FreeType/xttcap.c +++ b/src/FreeType/xttcap.c @@ -39,7 +39,7 @@ static char const * const releaseID = _XTT_RELEASE_NAME; */ -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #ifndef FONTMODULE #include <string.h> #include <ctype.h> |