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/06/28 03:24:52 UTC
[lucy-commits] svn commit: r1140393 - /incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c
Author: marvin
Date: Tue Jun 28 01:24:51 2011
New Revision: 1140393
URL: http://svn.apache.org/viewvc?rev=1140393&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/trunk/core/Lucy/Store/FSDirHandle.c
Modified: incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c?rev=1140393&r1=1140392&r2=1140393&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c Tue Jun 28 01:24:51 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 {