You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/07/01 07:40:22 UTC
[lucy-commits] svn commit: r1141816 - in /incubator/lucy/branches/0.1: ./
core/Lucy/Store/FSFileHandle.c
Author: marvin
Date: Fri Jul 1 05:40:22 2011
New Revision: 1141816
URL: http://svn.apache.org/viewvc?rev=1141816&view=rev
Log:
LUCY-168 Prefer sys/mman.h to windows.h.
Most of the memory mapping code in FSFileHandle.c was already using sys/mman.h
under Cygwin, but there was one preprocessor directive that had to be tweaked.
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/core/Lucy/Store/FSFileHandle.c
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 05:40:22 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140393,1140400,1140418,1140437,1140440,1140964
+/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140393,1140400,1140418,1140420,1140437,1140440,1140964
Modified: incubator/lucy/branches/0.1/core/Lucy/Store/FSFileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/core/Lucy/Store/FSFileHandle.c?rev=1141816&r1=1141815&r2=1141816&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/core/Lucy/Store/FSFileHandle.c (original)
+++ incubator/lucy/branches/0.1/core/Lucy/Store/FSFileHandle.c Fri Jul 1 05:40:22 2011
@@ -175,7 +175,7 @@ FSFH_close(FSFileHandle *self) {
}
self->fd = 0;
}
- #ifdef CHY_HAS_WINDOWS_H
+ #if (defined(CHY_HAS_WINDOWS_H) && !defined(CHY_HAS_SYS_MMAN_H))
if (self->win_fhandle) {
if (!SI_close_win_handles(self)) { return false; }
}