Fix compilation on Snow Leopard/FreeBSD for pbx_spool.c
authorKinsey Moore <kmoore@digium.com>
Tue, 25 Oct 2011 19:09:32 +0000 (19:09 +0000)
committerKinsey Moore <kmoore@digium.com>
Tue, 25 Oct 2011 19:09:32 +0000 (19:09 +0000)
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

pbx/pbx_spool.c

index 327c995..4f69c37 100644 (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) {