andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some includes to point into X11/fonts/ properly.

Browse Source
This commit is contained in:
Adam Jackson 2006-04-02 00:09:43 +00:00
parent e5b1d38e14
commit a605b9ffd3
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -4,6 +4,12 @@
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which
exists in the monolith but has an advertising clause in the license. 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> 2006-04-01 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_accel.c: (exaCopyWindow): * exa/exa_accel.c: (exaCopyWindow):

4
Xprint/ps/PsFTFonts.c
View File

@ -42,9 +42,9 @@ THE SOFTWARE.
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include "ft.h" #include <X11/fonts/ft.h>
#define NOT_IN_FTFUNCS #define NOT_IN_FTFUNCS
#include "ftfuncs.h" #include <X11/fonts/ftfuncs.h>
char * char *
PsGetFTFontFileName(FontPtr pFont) PsGetFTFontFileName(FontPtr pFont)

4
Xprint/ps/psout_ft.c
View File

@ -41,9 +41,9 @@ THE SOFTWARE.
#include <X11/fonts/fntfilst.h> #include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h> #include <X11/fonts/fontutil.h>
#include <X11/fonts/fontenc.h> #include <X11/fonts/fontenc.h>
#include "ft.h" #include <X11/fonts/ft.h>
#define NOT_IN_FTFUNCS #define NOT_IN_FTFUNCS
#include "ftfuncs.h" #include <X11/fonts/ftfuncs.h>
#include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */ #include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */
#define USE_FT_PS_NAMES 1 #define USE_FT_PS_NAMES 1

4
Xprint/ps/psout_ftpstype1.c
View File

@ -44,9 +44,9 @@ THE SOFTWARE.
#include <X11/fonts/fntfilst.h> #include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h> #include <X11/fonts/fontutil.h>
#include <X11/fonts/fontenc.h> #include <X11/fonts/fontenc.h>
#include "ft.h" #include <X11/fonts/ft.h>
#define NOT_IN_FTFUNCS #define NOT_IN_FTFUNCS
#include "ftfuncs.h" #include <X11/fonts/ftfuncs.h>
int do_debug_ft2pt1 = FALSE; int do_debug_ft2pt1 = FALSE;
int do_enable_ft2pt1_optimizer = FALSE; int do_enable_ft2pt1_optimizer = FALSE;

4
Xprint/ps/psout_ftpstype3.c
View File

@ -61,9 +61,9 @@ THE SOFTWARE.
#include <X11/fonts/fntfilst.h> #include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h> #include <X11/fonts/fontutil.h>
#include <X11/fonts/fontenc.h> #include <X11/fonts/fontenc.h>
#include "ft.h" #include <X11/fonts/ft.h>
#define NOT_IN_FTFUNCS #define NOT_IN_FTFUNCS
#include "ftfuncs.h" #include <X11/fonts/ftfuncs.h>
struct ft2info struct ft2info
{ {