diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:16 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:16 +0000 |
| commit | e49815e60342e1b31788a8f75dc4d55d3f1782db (patch) | |
| tree | f34ec750342760e7dbbd4e743a5907ab32ce0d1e | |
| parent | 57fa5c74bbca3231416ff7a2e5e3f9ad01368e14 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE
| -rw-r--r-- | fonttosfnt.c | 2 | ||||
| -rw-r--r-- | read.c | 6 | ||||
| -rw-r--r-- | 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 <stdio.h> @@ -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 <stdio.h> #include <ft2build.h> @@ -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))) @@ -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 <time.h> |