diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-11 15:54:16 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-11 15:54:16 +0000 |
commit | 5a2d5ae261bcc502af3a73e980f0f9847ab35709 (patch) | |
tree | f20d7e8daac155ca53fe595db34c8b7d66d1860e /Build/source/utils/pmx/pmx-2.6.18 | |
parent | 67b1218cddf910c657bebbd5d31045e0d08cda27 (diff) |
pmx: Adapt to W32TeX
git-svn-id: svn://tug.org/texlive/trunk@26999 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/pmx/pmx-2.6.18')
-rw-r--r-- | Build/source/utils/pmx/pmx-2.6.18/libf2c/f2c.h | 7 | ||||
-rw-r--r-- | Build/source/utils/pmx/pmx-2.6.18/libf2c/fio.h | 4 | ||||
-rw-r--r-- | Build/source/utils/pmx/pmx-2.6.18/libf2c/lread.c | 2 | ||||
-rw-r--r-- | Build/source/utils/pmx/pmx-2.6.18/libf2c/rsne.c | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/utils/pmx/pmx-2.6.18/libf2c/f2c.h b/Build/source/utils/pmx/pmx-2.6.18/libf2c/f2c.h index a91de9bf804..f66d28be5d2 100644 --- a/Build/source/utils/pmx/pmx-2.6.18/libf2c/f2c.h +++ b/Build/source/utils/pmx/pmx-2.6.18/libf2c/f2c.h @@ -23,8 +23,13 @@ typedef short int shortlogical; typedef char logical1; typedef char integer1; #ifdef INTEGER_STAR_8 /* Adjust for integer*8. */ +#if defined(WIN32) && !defined(__MINGW32__) +typedef __int64 longint; /* system-dependent */ +typedef unsigned __int64 ulongint; /* system-dependent */ +#else typedef long long longint; /* system-dependent */ typedef unsigned long long ulongint; /* system-dependent */ +#endif #define qbit_clear(a,b) ((a) & ~((ulongint)1 << (b))) #define qbit_set(a,b) ((a) | ((ulongint)1 << (b))) #endif @@ -159,6 +164,8 @@ typedef struct Namelist Namelist; #define abs(x) ((x) >= 0 ? (x) : -(x)) #define dabs(x) (doublereal)abs(x) +#undef min +#undef max #define min(a,b) ((a) <= (b) ? (a) : (b)) #define max(a,b) ((a) >= (b) ? (a) : (b)) #define dmin(a,b) (doublereal)min(a,b) diff --git a/Build/source/utils/pmx/pmx-2.6.18/libf2c/fio.h b/Build/source/utils/pmx/pmx-2.6.18/libf2c/fio.h index b16957a8fae..e709dde1934 100644 --- a/Build/source/utils/pmx/pmx-2.6.18/libf2c/fio.h +++ b/Build/source/utils/pmx/pmx-2.6.18/libf2c/fio.h @@ -3,6 +3,9 @@ #endif #include <sys/types.h> /* for off_t */ #include "stdio.h" +#ifdef HAVE_UNISTD_H +#include <unistd.h> /* for isatty() */ +#endif #ifdef WIN32 extern int w32getc(FILE *f); #define getc w32getc @@ -113,7 +116,6 @@ extern void f_init(void); extern int (*f__donewrec)(void), t_putc(int), x_wSL(void); extern void b_char(char*,char*,ftnlen), g_char(char*,ftnlen,char*); extern int c_sfe(cilist*), z_rnew(void); -extern int isatty(int); extern int err__fl(int,int,char*); extern int xrd_SL(void); extern int f__putbuf(int); diff --git a/Build/source/utils/pmx/pmx-2.6.18/libf2c/lread.c b/Build/source/utils/pmx/pmx-2.6.18/libf2c/lread.c index 55e068bf9fe..9636ae9c46e 100644 --- a/Build/source/utils/pmx/pmx-2.6.18/libf2c/lread.c +++ b/Build/source/utils/pmx/pmx-2.6.18/libf2c/lread.c @@ -74,8 +74,6 @@ un_getc(int x, FILE *f__cf) #define un_getc ungetc #ifdef KR_headers extern int ungetc(); -#else -extern int ungetc(int, FILE*); /* for systems with a buggy stdio.h */ #endif #endif diff --git a/Build/source/utils/pmx/pmx-2.6.18/libf2c/rsne.c b/Build/source/utils/pmx/pmx-2.6.18/libf2c/rsne.c index f3fcfac13b1..3a32c40b259 100644 --- a/Build/source/utils/pmx/pmx-2.6.18/libf2c/rsne.c +++ b/Build/source/utils/pmx/pmx-2.6.18/libf2c/rsne.c @@ -66,7 +66,6 @@ un_getc(int x, FILE *f__cf) { return ungetc(x,f__cf); } #else #define un_getc ungetc -extern int ungetc(int, FILE*); /* for systems with a buggy stdio.h */ #endif #endif |