[asterisk-commits] kmoore: trunk r342330 - in /trunk: ./ pbx/pbx_spool.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Oct 25 14:09:32 2011
New Revision: 342330

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=342330
Log:
Fix compilation on Snow Leopard/FreeBSD for pbx_spool.c

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

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_spool.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/pbx/pbx_spool.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_spool.c?view=diff&rev=342330&r1=342329&r2=342330
==============================================================================
--- trunk/pbx/pbx_spool.c (original)
+++ trunk/pbx/pbx_spool.c Tue Oct 25 14:09:32 2011
@@ -718,6 +718,9 @@
 			} 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 @@
 					queue_file(de->d_name, 0);
 				}
 			}
-#endif
 			time(&now);
 		}
-
-		queue_created_files();
+#endif
+
 		/* 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) {