diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-02-27 13:13:49 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-02-27 13:13:49 +0200 |
| commit | 9449b700197b1d120d194cefe294f44460c0adab (patch) | |
| tree | a7433a4ff626cf6ecfe26b62ade74373c9bcc0d4 /libgfortran | |
| parent | 57fa080bf6c0ae01bf1643a87e72ca636bde0454 (diff) | |
| download | gcc-9449b700197b1d120d194cefe294f44460c0adab.zip gcc-9449b700197b1d120d194cefe294f44460c0adab.tar.gz gcc-9449b700197b1d120d194cefe294f44460c0adab.tar.bz2 | |
Don't try to use rand_s on CYGWIN
CYGWIN seems to include _mingw.h and thus __MINGW64_VERSION_MAJOR is
defined even though rand_s is not available. Thus add an extra check
for __CYGWIN__.
2017-02-27 Janne Blomqvist <jb@gcc.gnu.org>
* intrinsics/random.c (getosrandom): Don't try to use rand_s on
CYGWIN.
From-SVN: r245755
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/intrinsics/random.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 4cdb3b4..0485e6f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2017-02-27 Janne Blomqvist <jb@gcc.gnu.org> + + * intrinsics/random.c (getosrandom): Don't try to use rand_s on + CYGWIN. + 2017-02-16 Paul Thomas <pault@gcc.gnu.org> PR fortran/79382 diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c index d4f5b82..3803687 100644 --- a/libgfortran/intrinsics/random.c +++ b/libgfortran/intrinsics/random.c @@ -304,7 +304,7 @@ static int getosrandom (void *buf, size_t buflen) { /* rand_s is available in MinGW-w64 but not plain MinGW. */ -#ifdef __MINGW64_VERSION_MAJOR +#if defined(__MINGW64_VERSION_MAJOR) && !defined(__CYGWIN__) unsigned int* b = buf; for (unsigned i = 0; i < buflen / sizeof (unsigned int); i++) rand_s (&b[i]); |