[asterisk-commits] mmichelson: branch group/asterisk-cpp r168413 - /team/group/asterisk-cpp/main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Sat Jan 10 19:41:38 2009
New Revision: 168413

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168413
Log:
timing.c compiles


Modified:
    team/group/asterisk-cpp/main/timing.c

Modified: team/group/asterisk-cpp/main/timing.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/timing.c?view=diff&rev=168413&r1=168412&r2=168413
==============================================================================
--- team/group/asterisk-cpp/main/timing.c (original)
+++ team/group/asterisk-cpp/main/timing.c Sat Jan 10 19:41:38 2009
@@ -189,7 +189,7 @@
 
 	if (!timer_funcs.timer_get_event) {
 		ast_rwlock_unlock(&lock);
-		return -1;
+		return (enum ast_timing_event) -1;
 	}
 
 	result = timer_funcs.timer_get_event(handle);
@@ -255,10 +255,10 @@
 
 	while (ast_tvdiff_ms((end = ast_tvnow()), start) < 1000) {
 		int res;
-		struct pollfd pfd = {
-			.fd = fd,
-			.events = POLLIN | POLLPRI,
-		};
+		struct pollfd pfd;
+
+		pfd.fd = fd;
+		pfd.events = (POLLIN | POLLPRI);
 
 		res = poll(&pfd, 1, 100);
 
@@ -281,7 +281,7 @@
 }
 
 static struct ast_cli_entry cli_timing[] = {
-	AST_CLI_DEFINE(timing_test, "Run a timing test"),
+	ast_cli_entry(timing_test, "Run a timing test"),
 };
 
 int ast_timing_init(void)