diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-23 16:14:03 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-23 16:14:03 +0000 |
commit | 8ee4ce87e030dd4e217f99e924233dbbf393e049 (patch) | |
tree | a4fc2a004c2e92bdbba8d57a192ef96c0a434ef1 /Build/source/texk/ps2pkm | |
parent | b243861dbff7f1514485d8f4df1770c4aba31a4a (diff) |
build system fixes, mostly for mingw32 cross and win32
git-svn-id: svn://tug.org/texlive/trunk@17166 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ps2pkm')
-rw-r--r-- | Build/source/texk/ps2pkm/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/ps2pkm/t1info.c | 2 | ||||
-rw-r--r-- | Build/source/texk/ps2pkm/t1stub.c | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index 184fc5a52a4..c31603f8523 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/ChangeLog @@ -1,3 +1,10 @@ +2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * t1info.c (ComputeStdProps): Declare rc as int, not LONG, + because they differ for WIN32. + * t1stub.c: Use ANSI C protos (not only for WIN32). + Declare struct segment (#include "paths.h" doesn't work). + 2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de> * basics.c: Don't #include <win32lib.h> for MinGW32. diff --git a/Build/source/texk/ps2pkm/t1info.c b/Build/source/texk/ps2pkm/t1info.c index f7cdb4e5a2e..8b64d600f6b 100644 --- a/Build/source/texk/ps2pkm/t1info.c +++ b/Build/source/texk/ps2pkm/t1info.c @@ -269,7 +269,7 @@ ComputeStdProps(pInfo, Vals, Filename, Fontname) char *ptr1, *ptr2; char *infostrP; - LONG rc; + int rc; char scaledName[MAXFONTNAMELEN]; strcpy (scaledName, Fontname); diff --git a/Build/source/texk/ps2pkm/t1stub.c b/Build/source/texk/ps2pkm/t1stub.c index b537b53b989..6405b64c106 100644 --- a/Build/source/texk/ps2pkm/t1stub.c +++ b/Build/source/texk/ps2pkm/t1stub.c @@ -30,17 +30,15 @@ #include "objects.h" /* get #define for t1_abort() */ -xiStub() +xiStub(void) { printf("xiStub called\n"); t1_abort("xiStub called"); } - -#ifdef WIN32 + +struct segment; + void t1_DumpText(struct segment * foo) -#else -void t1_DumpText() -#endif { xiStub(); } |