From d139771b43e0612fbf2e0f4c61301596f47c1edd Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 29 Jul 2015 20:01:34 +0100 Subject: [PATCH] ITS#8192 fix reference to EINTR on WIN32 from ITS#8106 --- libraries/liblmdb/mdb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index adc20f8..b5d59bc 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -3648,7 +3648,6 @@ mdb_env_write_meta(MDB_txn *txn) /* Write to the SYNC fd */ mfd = env->me_flags & (MDB_NOSYNC|MDB_NOMETASYNC) ? env->me_fd : env->me_mfd; -retry_write: #ifdef _WIN32 { memset(&ov, 0, sizeof(ov)); @@ -3657,12 +3656,15 @@ retry_write: rc = -1; } #else +retry_write: rc = pwrite(mfd, ptr, len, off); #endif if (rc != len) { rc = rc < 0 ? ErrCode() : EIO; +#ifndef _WIN32 if (rc == EINTR) goto retry_write; +#endif DPUTS("write failed, disk error?"); /* On a failure, the pagecache still contains the new data. * Write some old data back, to prevent it from being used.