From e49815e60342e1b31788a8f75dc4d55d3f1782db Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 15 Sep 2004 16:34:16 +0000 Subject: Pull XORG-6_8_0 to CYGWIN branch --- fonttosfnt.c | 2 +- read.c | 6 ++++-- util.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fonttosfnt.c b/fonttosfnt.c index 0a90b01..2b7537d 100644 --- a/fonttosfnt.c +++ b/fonttosfnt.c @@ -19,7 +19,7 @@ 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/programs/fonttosfnt/fonttosfnt.c,v 1.1.4.1.4.2 2004/03/04 19:42:54 kaleb Exp $ */ +/* $XdotOrg: xc/programs/fonttosfnt/fonttosfnt.c,v 1.2 2004/04/23 19:54:32 eich Exp $ */ /* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ #include diff --git a/read.c b/read.c index 9e0c666..7158103 100644 --- a/read.c +++ b/read.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.1.4.1.4.1 2004/03/04 17:48:48 eich Exp $ */ +/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.3 2004/05/24 19:06:59 eich Exp $ */ /* Copyright (c) 2002 by Juliusz Chroboczek @@ -20,7 +20,9 @@ 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/programs/fonttosfnt/read.c,v 1.3 2004/05/24 19:06:59 eich Exp $ */ /* $XFree86: xc/programs/fonttosfnt/read.c,v 1.5 2003/12/19 02:05:39 dawes Exp $ */ + #include #include @@ -28,7 +30,7 @@ THE SOFTWARE. #include FT_BDF_H #include "X11/Xos.h" #include "fonttosfnt.h" -#include "fontenc.h" +#include "X11/fonts/fontenc.h" #define FLOOR2(x, y) ((x) >= 0 ? (x) / (y) : -(((-(x)) + (y) - 1) / (y))) #define CEIL2(x, y) (FLOOR2((x) + (y) - 1, (y))) diff --git a/util.c b/util.c index 69a37ec..05a3156 100644 --- a/util.c +++ b/util.c @@ -19,7 +19,7 @@ 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/programs/fonttosfnt/util.c,v 1.1.4.1.4.2 2004/03/04 19:45:27 kaleb Exp $ */ +/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.2 2004/04/23 19:54:32 eich Exp $ */ /* $XFree86: xc/programs/fonttosfnt/util.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */ #include -- cgit v1.2.3