Fix some includes to point into X11/fonts/ properly.
This commit is contained in:
parent
e5b1d38e14
commit
a605b9ffd3
|
@ -4,6 +4,12 @@
|
|||
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which
|
||||
exists in the monolith but has an advertising clause in the license.
|
||||
|
||||
* Xprint/ps/PsFTFonts.c:
|
||||
* Xprint/ps/psout_ft.c:
|
||||
* Xprint/ps/psout_ftpstype1.c:
|
||||
* Xprint/ps/psout_ftpstype3.c:
|
||||
Fix some includes to point into X11/fonts/ properly.
|
||||
|
||||
2006-04-01 Eric Anholt <anholt@FreeBSD.org>
|
||||
|
||||
* exa/exa_accel.c: (exaCopyWindow):
|
||||
|
|
|
@ -42,9 +42,9 @@ THE SOFTWARE.
|
|||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include "ft.h"
|
||||
#include <X11/fonts/ft.h>
|
||||
#define NOT_IN_FTFUNCS
|
||||
#include "ftfuncs.h"
|
||||
#include <X11/fonts/ftfuncs.h>
|
||||
|
||||
char *
|
||||
PsGetFTFontFileName(FontPtr pFont)
|
||||
|
|
|
@ -41,9 +41,9 @@ THE SOFTWARE.
|
|||
#include <X11/fonts/fntfilst.h>
|
||||
#include <X11/fonts/fontutil.h>
|
||||
#include <X11/fonts/fontenc.h>
|
||||
#include "ft.h"
|
||||
#include <X11/fonts/ft.h>
|
||||
#define NOT_IN_FTFUNCS
|
||||
#include "ftfuncs.h"
|
||||
#include <X11/fonts/ftfuncs.h>
|
||||
#include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */
|
||||
|
||||
#define USE_FT_PS_NAMES 1
|
||||
|
|
|
@ -44,9 +44,9 @@ THE SOFTWARE.
|
|||
#include <X11/fonts/fntfilst.h>
|
||||
#include <X11/fonts/fontutil.h>
|
||||
#include <X11/fonts/fontenc.h>
|
||||
#include "ft.h"
|
||||
#include <X11/fonts/ft.h>
|
||||
#define NOT_IN_FTFUNCS
|
||||
#include "ftfuncs.h"
|
||||
#include <X11/fonts/ftfuncs.h>
|
||||
|
||||
int do_debug_ft2pt1 = FALSE;
|
||||
int do_enable_ft2pt1_optimizer = FALSE;
|
||||
|
|
|
@ -61,9 +61,9 @@ THE SOFTWARE.
|
|||
#include <X11/fonts/fntfilst.h>
|
||||
#include <X11/fonts/fontutil.h>
|
||||
#include <X11/fonts/fontenc.h>
|
||||
#include "ft.h"
|
||||
#include <X11/fonts/ft.h>
|
||||
#define NOT_IN_FTFUNCS
|
||||
#include "ftfuncs.h"
|
||||
#include <X11/fonts/ftfuncs.h>
|
||||
|
||||
struct ft2info
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user