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/21 22:48:30 UTC
[1/3] git commit: refs/heads/mingw-fixes - Fix DECREF name clash
Repository: lucy
Updated Branches:
refs/heads/mingw-fixes [created] 7ac897cc3
Fix DECREF name clash
MinGW's winnt.h also defines DECREF.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/479c2778
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/479c2778
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/479c2778
Branch: refs/heads/mingw-fixes
Commit: 479c2778add617cc7d1f90b6fd10f3e7c44d470c
Parents: ac8f8ec
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 21 21:46:11 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 21 21:46:11 2014 +0200
----------------------------------------------------------------------
core/Lucy/Store/FSDirHandle.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/479c2778/core/Lucy/Store/FSDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSDirHandle.c b/core/Lucy/Store/FSDirHandle.c
index f17ea15..f231471 100644
--- a/core/Lucy/Store/FSDirHandle.c
+++ b/core/Lucy/Store/FSDirHandle.c
@@ -179,7 +179,7 @@ FSDH_Next_IMP(FSDirHandle *self) {
}
else if ((FindNextFile(dirhandle, find_data) == 0)) {
// Iterator exhausted. Verify that no errors were encountered.
- DECREF(ivars->entry);
+ CFISH_DECREF(ivars->entry);
ivars->entry = NULL;
if (GetLastError() != ERROR_NO_MORE_FILES) {
char *win_error = Err_win_error();
@@ -197,7 +197,7 @@ FSDH_Next_IMP(FSDirHandle *self) {
return FSDH_Next(self);
}
else {
- DECREF(ivars->entry);
+ CFISH_DECREF(ivars->entry);
ivars->entry = Str_new_from_utf8(find_data->cFileName, len);
return true;
}
[2/3] git commit: refs/heads/mingw-fixes - Regenerate charmonizer.c
for MinGW
Posted by nw...@apache.org.
Regenerate charmonizer.c for MinGW
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3c9015bf
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3c9015bf
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3c9015bf
Branch: refs/heads/mingw-fixes
Commit: 3c9015bf6cadd0986a23c91c50752fd1b223d24b
Parents: 479c277
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 21 22:34:48 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 21 22:34:48 2014 +0200
----------------------------------------------------------------------
common/charmonizer.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/3c9015bf/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 683dfe0..3318d79 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -6887,7 +6887,19 @@ chaz_SymbolVisibility_run(void) {
if (chaz_CC_test_compile(code_buf)) {
can_control_visibility = true;
chaz_ConfWriter_add_def("EXPORT", export_win);
- chaz_ConfWriter_add_def("IMPORT", "__declspec(dllimport)");
+ if (chaz_CC_gcc_version_num()) {
+ /*
+ * Under MinGW, symbols with dllimport storage class aren't
+ * constant. If a global variable is initialized to such a
+ * symbol, an "initializer element is not constant" error
+ * results. Omitting dllimport works, but has a small
+ * performance penalty.
+ */
+ chaz_ConfWriter_add_def("IMPORT", NULL);
+ }
+ else {
+ chaz_ConfWriter_add_def("IMPORT", "__declspec(dllimport)");
+ }
}
}
[3/3] git commit: refs/heads/mingw-fixes - Update .gitignore for MinGW
Posted by nw...@apache.org.
Update .gitignore for MinGW
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/7ac897cc
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7ac897cc
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7ac897cc
Branch: refs/heads/mingw-fixes
Commit: 7ac897cc335aa9d3e9e7df835ca233ae49c5b577
Parents: 3c9015b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 21 22:45:44 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 21 22:45:44 2014 +0200
----------------------------------------------------------------------
c/.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/7ac897cc/c/.gitignore
----------------------------------------------------------------------
diff --git a/c/.gitignore b/c/.gitignore
index 6fc6f3f..bc7ef84 100644
--- a/c/.gitignore
+++ b/c/.gitignore
@@ -3,6 +3,7 @@
/charmonizer
/charmonizer.exe
/charmony.h
+/liblucy-*.dll
/liblucy.*.dylib
/liblucy.dylib
/liblucy.so