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:35:20 UTC
[lucy-commits] svn commit: r1141811 - in /incubator/lucy/branches/0.1: ./
core/Lucy/Store/FSDirHandle.c
Author: marvin
Date: Fri Jul 1 05:35:19 2011
New Revision: 1141811
URL: http://svn.apache.org/viewvc?rev=1141811&view=rev
Log:
LUCY-167 Fix INCREF/DECREF symbol collision with windows.h.
Use long forms LUCY_INCREF and LUCY_DECREF to avoid conflicting with symbols
defined by windows.h.
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/core/Lucy/Store/FSDirHandle.c
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 05:35:19 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140437,1140440,1140964
+/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140393,1140437,1140440,1140964
Modified: incubator/lucy/branches/0.1/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/core/Lucy/Store/FSDirHandle.c?rev=1141811&r1=1141810&r2=1141811&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/core/Lucy/Store/FSDirHandle.c (original)
+++ incubator/lucy/branches/0.1/core/Lucy/Store/FSDirHandle.c Fri Jul 1 05:35:19 2011
@@ -195,7 +195,7 @@ FSDH_do_open(FSDirHandle *self, const Ch
// Deal with Windows ceiling on file path lengths.
Err_set_error(Err_new(CB_newf("Directory path is too long: %o",
dir)));
- DECREF(self);
+ LUCY_DECREF(self);
return NULL;
}
@@ -209,7 +209,7 @@ FSDH_do_open(FSDirHandle *self, const Ch
if (INVALID_HANDLE_VALUE == self->sys_dirhandle) {
// Directory inaccessible or doesn't exist.
Err_set_error(Err_new(CB_newf("Failed to open dir '%o'", dir)));
- DECREF(self);
+ LUCY_DECREF(self);
return NULL;
}
else {
@@ -266,7 +266,7 @@ FSDH_close(FSDirHandle *self) {
// If we encountered an error condition previously, report it now.
if (self->saved_error) {
- Err_set_error((Err*)INCREF(self->saved_error));
+ Err_set_error((Err*)LUCY_INCREF(self->saved_error));
return false;
}
else {