kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on Snow Leopard/FreeBSD for pbx_spool.c

Browse Source 
One of the changes in the recent spool handling of hardlinks patch was just
outside a HAVE_INOTIFY block and caused compilation to fail in some build
environments.  This has been corrected.
........

Merged revisions 342328 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 342329 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2011-10-25 19:09:32 +00:00
parent c34674511d
commit 3551bfcbbc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pbx/pbx_spool.c
View File

@@ -718,6 +718,9 @@ static void *scan_thread(void *unused)
} else if (res < 0 && errno != EINTR && errno != EAGAIN) {
ast_debug(1, "Got an error back from %s(2): %s\n", stage ? "read" : "poll", strerror(errno));
}
time(&now);
}
queue_created_files();
#else
struct timespec ts2 = { next - now, 0 };
if (kevent(inotify_fd, NULL, 0, &kev, 1, &ts2) <= 0) {
@@ -730,11 +733,10 @@ static void *scan_thread(void *unused)
queue_file(de->d_name, 0);
}
}
#endif
time(&now);
}
#endif
queue_created_files();
/* Empty the list of all entries ready to be processed */
AST_LIST_LOCK(&dirlist);
while (!AST_LIST_EMPTY(&dirlist) && AST_LIST_FIRST(&dirlist)->mtime <= now) {