tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compile either fam or inotify not both

Browse Source
This commit is contained in:
dockes 2009-11-30 06:34:49 +00:00
parent 98feedce8e
commit 6eaed467b0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/index/rclmonrcv.cpp
View File

@ -195,6 +195,9 @@ void *rclMonRcvRun(void *q)
return 0; return 0;
} }
// We dont compile both the inotify and the fam interface and inotify
// has preference
#ifndef RCL_USE_INOTIFY
#ifdef RCL_USE_FAM #ifdef RCL_USE_FAM
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
/** Fam/gamin -based monitor class */ /** Fam/gamin -based monitor class */
@ -376,7 +379,7 @@ bool RclFAM::getEvent(RclMonEvent& ev, int secs)
return true; return true;
} }
#endif // RCL_USE_FAM #endif // RCL_USE_FAM
#endif // ! INOTIFY
#ifdef RCL_USE_INOTIFY #ifdef RCL_USE_INOTIFY
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -568,12 +571,16 @@ bool RclIntf::getEvent(RclMonEvent& ev, int secs)
// The monitor 'factory' // The monitor 'factory'
static RclMonitor *makeMonitor() static RclMonitor *makeMonitor()
{ {
#ifdef RCL_USE_FAM
return new RclFAM;
#endif
#ifdef RCL_USE_INOTIFY #ifdef RCL_USE_INOTIFY
return new RclIntf; return new RclIntf;
#endif #endif
#ifndef RCL_USE_INOTIFY
#ifdef RCL_USE_FAM
return new RclFAM;
#endif
#endif
LOGINFO(("RclMonitor: neither Inotify nor Fam was compiled as "
"file system change notification interface\n"));
return 0; return 0;
} }
#endif // RCL_MONITOR #endif // RCL_MONITOR