[asterisk-commits] branch oej/metermaids-trunk r16237 - in /team/oej/metermaids-trunk: ./ channe...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 29 14:38:28 2006
New Revision: 16237

URL: http://svn.digium.com/view/asterisk?rev=16237&view=rev
Log:
Update to trunk

Modified:
    team/oej/metermaids-trunk/Makefile
    team/oej/metermaids-trunk/channels/chan_local.c
    team/oej/metermaids-trunk/res/res_features.c

Modified: team/oej/metermaids-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/Makefile?rev=16237&r1=16236&r2=16237&view=diff
==============================================================================
--- team/oej/metermaids-trunk/Makefile (original)
+++ team/oej/metermaids-trunk/Makefile Wed Mar 29 14:38:28 2006
@@ -236,7 +236,7 @@
 INCLUDE+=-Iinclude -I../include
 ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 ASTCFLAGS+=$(OPTIMIZE)
-ASTCFLAGS+=# -Werror -Wunused
+ASTCFLAGS+= -Werror -Wunused
 ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4)
 ASTCFLAGS+= -Wno-pointer-sign
 endif
@@ -397,8 +397,8 @@
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
+  #OBJS+=poll.o
+  #ASTCFLAGS+=-DPOLLCOMPAT
 else
 #These are used for all but Darwin
   ASTLINK=-Wl,-E 

Modified: team/oej/metermaids-trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_local.c?rev=16237&r1=16236&r2=16237&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_local.c (original)
+++ team/oej/metermaids-trunk/channels/chan_local.c Wed Mar 29 14:38:28 2006
@@ -136,7 +136,7 @@
 	char *exten;
 	char *context;
 
-	int res = AST_DEVICE_INVALID;
+	int res;
 		
 	exten = ast_strdupa(data);
 	if ((context  = strchr(exten, '@'))) {
@@ -147,9 +147,9 @@
 		ast_log(LOG_DEBUG, "Checking if extension %s@%s exists (devicestate)\n", exten, context);
 	res = ast_exists_extension(NULL, context, exten, 1, NULL);
 	if (!res)
-		return AST_DEVICE_UNAVAILABLE;
+		return AST_DEVICE_NOT_INUSE;
 	else
-		return AST_DEVICE_NOT_INUSE;
+		return AST_DEVICE_INUSE;
 }
 
 static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f, struct ast_channel *us)

Modified: team/oej/metermaids-trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/res/res_features.c?rev=16237&r1=16236&r2=16237&view=diff
==============================================================================
--- team/oej/metermaids-trunk/res/res_features.c (original)
+++ team/oej/metermaids-trunk/res/res_features.c Wed Mar 29 14:38:28 2006
@@ -154,8 +154,6 @@
 AST_MUTEX_DEFINE_STATIC(parking_lock);
 
 static pthread_t parking_thread;
-
-STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;