Changeset View
Changeset View
Standalone View
Standalone View
head/devel/flang/files/patch-runtime_flangrti_iostdinit.c
--- runtime/flangrti/iostdinit.c.orig 2017-05-17 00:40:01 UTC | --- runtime/flangrti/iostdinit.c.orig 2017-10-19 11:03:03 UTC | ||||
+++ runtime/flangrti/iostdinit.c | +++ runtime/flangrti/iostdinit.c | ||||
@@ -160,7 +160,7 @@ __io_ferror(void *p) | @@ -160,7 +160,7 @@ __io_ferror(void *p) | ||||
int | int | ||||
__io_getfd(void *fp) | __io_getfd(void *fp) | ||||
{ | { | ||||
- return (((FILE *)fp)->_fileno); | - return (((FILE *)fp)->_fileno); | ||||
+ return (((FILE *)fp)->_file); | + return (((FILE *)fp)->_file); | ||||
} | } | ||||
/* is a tty? */ | /* is a tty? */ | ||||
@@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for | @@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for crtdll.dll */ | ||||
#define timezone _timezone /* cygnus, timezone is usually a function */ | #define timezone _timezone /* cygnus, timezone is usually a function */ | ||||
#endif | #endif | ||||
-#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) /* !defined(WINNT) */ | -#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) /* !defined(WINNT) */ | ||||
+#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) && !defined(__FreeBSD__) /* !defined(WINNT) */ | +#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) && !defined(__FreeBSD__) /* !defined(WINNT) */ | ||||
extern time_t timezone; /* for the rest */ | extern time_t timezone; /* for the rest */ | ||||
#endif | #endif | ||||
int | int | ||||
__io_timezone(void *tm) | __io_timezone(void *tm) | ||||
{ | { | ||||
-#if defined(SUN4) || defined(PPC) || defined(OSX86) | -#if defined(SUN4) || defined(PPC) || defined(OSX86) | ||||
+#if defined(SUN4) || defined(PPC) || defined(OSX86) || defined(__FreeBSD__) | +#if defined(SUN4) || defined(PPC) || defined(OSX86) || defined(__FreeBSD__) | ||||
return ((struct tm *)tm)->tm_gmtoff; | return ((struct tm *)tm)->tm_gmtoff; | ||||
#elif defined(WINNT) || defined(WIN64) || defined(WIN32) | #elif defined(WINNT) || defined(WIN64) || defined(WIN32) | ||||
return (0); | return (0); |