mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@342328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -711,6 +711,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) { | ||||
| @@ -723,11 +726,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) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user