You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/07/22 20:59:26 UTC

[1/2] git commit: refs/heads/mingw-fixes - Add missing chy_ prefix

Repository: lucy
Updated Branches:
  refs/heads/mingw-fixes 3b1945e02 -> 538654edd


Add missing chy_ prefix

Fixes Cygwin build.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/cfdefaf8
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/cfdefaf8
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/cfdefaf8

Branch: refs/heads/mingw-fixes
Commit: cfdefaf81be28806d4d9fc635ca4d362f91e737a
Parents: 3b1945e
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Tue Jul 22 20:50:47 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue Jul 22 20:50:47 2014 +0200

----------------------------------------------------------------------
 core/Lucy/Store/FSFileHandle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/cfdefaf8/core/Lucy/Store/FSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFileHandle.c b/core/Lucy/Store/FSFileHandle.c
index 74f5ffc..17b6a07 100644
--- a/core/Lucy/Store/FSFileHandle.c
+++ b/core/Lucy/Store/FSFileHandle.c
@@ -421,7 +421,7 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     }
 
     // Read.
-    check_val = pread64(ivars->fd, dest, len, offset);
+    check_val = chy_pread64(ivars->fd, dest, len, offset);
     if (check_val != (int64_t)len) {
         if (check_val == -1) {
             Err_set_error(Err_new(Str_newf("Tried to read %u64 bytes, got %i64: %s",


[2/2] git commit: refs/heads/mingw-fixes - Update .gitignore for Cygwin

Posted by nw...@apache.org.
Update .gitignore for Cygwin


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/538654ed
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/538654ed
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/538654ed

Branch: refs/heads/mingw-fixes
Commit: 538654edda153481650233d78473b3f9cb7d584c
Parents: cfdefaf
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Tue Jul 22 20:57:50 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue Jul 22 20:57:50 2014 +0200

----------------------------------------------------------------------
 c/.gitignore | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/538654ed/c/.gitignore
----------------------------------------------------------------------
diff --git a/c/.gitignore b/c/.gitignore
index bc7ef84..7873433 100644
--- a/c/.gitignore
+++ b/c/.gitignore
@@ -3,6 +3,7 @@
 /charmonizer
 /charmonizer.exe
 /charmony.h
+/cyglucy-*.dll
 /liblucy-*.dll
 /liblucy.*.dylib
 /liblucy.dylib