From b5404d59071bcdd372a26fbb8e75aebff96f3ac6 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Wed, 22 Apr 2009 00:40:31 +0000 Subject: [PATCH] Got rid of warnings on windows. --- ext/f2c_libs/f2c.h | 1 + ext/f2c_libs/fio.h | 2 ++ ext/f2c_libs/getenv_.c | 2 ++ ext/f2c_libs/lread.c | 2 ++ ext/f2c_libs/rsne.c | 2 ++ ext/f2c_libs/s_paus.c | 6 +++++- 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ext/f2c_libs/f2c.h b/ext/f2c_libs/f2c.h index 1f78d120c..6ddb51b30 100644 --- a/ext/f2c_libs/f2c.h +++ b/ext/f2c_libs/f2c.h @@ -22,6 +22,7 @@ typedef __int64 ulongint; /* HACK ALERT */ // warning C4101: 'xxx' : unreferenced local variable #pragma warning(disable:4244) #pragma warning(disable:4101) +#pragma warning(disable:4554) #endif //typedef long int integer; diff --git a/ext/f2c_libs/fio.h b/ext/f2c_libs/fio.h index 3d168bfcd..4c3043e9c 100644 --- a/ext/f2c_libs/fio.h +++ b/ext/f2c_libs/fio.h @@ -108,7 +108,9 @@ 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); +#ifndef WIN32 extern int isatty(int); +#endif extern int err__fl(int,int,char*); extern int xrd_SL(void); extern int f__putbuf(int); diff --git a/ext/f2c_libs/getenv_.c b/ext/f2c_libs/getenv_.c index 4c7ecd269..4d912c524 100644 --- a/ext/f2c_libs/getenv_.c +++ b/ext/f2c_libs/getenv_.c @@ -3,6 +3,8 @@ #ifdef KR_headers extern char *F77_aloc(), *getenv(); #else +#undef min +#undef max #include #include #ifdef __cplusplus diff --git a/ext/f2c_libs/lread.c b/ext/f2c_libs/lread.c index 55e068bf9..bf54a2e41 100644 --- a/ext/f2c_libs/lread.c +++ b/ext/f2c_libs/lread.c @@ -75,8 +75,10 @@ un_getc(int x, FILE *f__cf) #ifdef KR_headers extern int ungetc(); #else +#ifndef WIN32 extern int ungetc(int, FILE*); /* for systems with a buggy stdio.h */ #endif +#endif #endif int diff --git a/ext/f2c_libs/rsne.c b/ext/f2c_libs/rsne.c index f3fcfac13..4f6b57a60 100644 --- a/ext/f2c_libs/rsne.c +++ b/ext/f2c_libs/rsne.c @@ -66,8 +66,10 @@ un_getc(int x, FILE *f__cf) { return ungetc(x,f__cf); } #else #define un_getc ungetc +#ifndef WIN32 extern int ungetc(int, FILE*); /* for systems with a buggy stdio.h */ #endif +#endif #endif static Vardesc * diff --git a/ext/f2c_libs/s_paus.c b/ext/f2c_libs/s_paus.c index 51d80eb08..c5977174c 100644 --- a/ext/f2c_libs/s_paus.c +++ b/ext/f2c_libs/s_paus.c @@ -19,7 +19,11 @@ extern "C" { #ifdef __cplusplus extern "C" { #endif -extern int getpid(void), isatty(int), pause(void); +extern int getpid(void); +#ifndef WIN32 +extern int isatty(int); +#endif +extern int pause(void); #endif extern VOID f_exit(Void);