[svn-commits] twilson: branch twilson/calendaring r182879 - in /team/twilson/calendaring: ....
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Mar 17 23:02:48 CDT 2009
Author: twilson
Date: Tue Mar 17 23:02:14 2009
New Revision: 182879
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182879
Log:
Update and re-automergify
Modified:
team/twilson/calendaring/ (props changed)
team/twilson/calendaring/apps/app_mp3.c
team/twilson/calendaring/apps/app_nbscat.c
team/twilson/calendaring/channels/chan_alsa.c
team/twilson/calendaring/channels/chan_skinny.c
team/twilson/calendaring/configure
team/twilson/calendaring/configure.ac
team/twilson/calendaring/include/asterisk/autoconfig.h.in
team/twilson/calendaring/include/asterisk/channel.h
team/twilson/calendaring/include/asterisk/io.h
team/twilson/calendaring/include/asterisk/poll-compat.h
team/twilson/calendaring/main/Makefile
team/twilson/calendaring/main/asterisk.c
team/twilson/calendaring/main/channel.c
team/twilson/calendaring/main/io.c
team/twilson/calendaring/main/poll.c
team/twilson/calendaring/main/utils.c
team/twilson/calendaring/res/res_agi.c
team/twilson/calendaring/res/res_config_ldap.c
team/twilson/calendaring/res/res_config_sqlite.c
team/twilson/calendaring/res/res_curl.c
team/twilson/calendaring/res/res_jabber.exports
team/twilson/calendaring/res/res_odbc.c
team/twilson/calendaring/res/res_odbc.exports
team/twilson/calendaring/res/res_phoneprov.c
Propchange: team/twilson/calendaring/
------------------------------------------------------------------------------
automerge = *
Propchange: team/twilson/calendaring/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/twilson/calendaring/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 17 23:02:14 2009
@@ -1,1 +1,1 @@
-/trunk:1-182845
+/trunk:1-182878
Modified: team/twilson/calendaring/apps/app_mp3.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/apps/app_mp3.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/apps/app_mp3.c (original)
+++ team/twilson/calendaring/apps/app_mp3.c Tue Mar 17 23:02:14 2009
@@ -108,7 +108,7 @@
struct pollfd fds[1];
fds[0].fd = fd;
fds[0].events = POLLIN;
- res = poll(fds, 1, timeout);
+ res = ast_poll(fds, 1, timeout);
if (res < 1) {
ast_log(LOG_NOTICE, "Poll timed out/errored out with %d\n", res);
return -1;
Modified: team/twilson/calendaring/apps/app_nbscat.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/apps/app_nbscat.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/apps/app_nbscat.c (original)
+++ team/twilson/calendaring/apps/app_nbscat.c Tue Mar 17 23:02:14 2009
@@ -96,7 +96,7 @@
struct pollfd fds[1];
fds[0].fd = fd;
fds[0].events = POLLIN;
- res = poll(fds, 1, 2000);
+ res = ast_poll(fds, 1, 2000);
if (res < 1) {
ast_log(LOG_NOTICE, "Selected timed out/errored out with %d\n", res);
return -1;
Modified: team/twilson/calendaring/channels/chan_alsa.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/channels/chan_alsa.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/channels/chan_alsa.c (original)
+++ team/twilson/calendaring/channels/chan_alsa.c Tue Mar 17 23:02:14 2009
@@ -55,6 +55,7 @@
#include "asterisk/stringfields.h"
#include "asterisk/abstract_jb.h"
#include "asterisk/musiconhold.h"
+#include "asterisk/poll-compat.h"
/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf = {
Modified: team/twilson/calendaring/channels/chan_skinny.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/channels/chan_skinny.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/channels/chan_skinny.c (original)
+++ team/twilson/calendaring/channels/chan_skinny.c Tue Mar 17 23:02:14 2009
@@ -6248,7 +6248,7 @@
fds[0].fd = s->fd;
fds[0].events = POLLIN;
fds[0].revents = 0;
- res = poll(fds, 1, (keep_alive * 1100)); /* If nothing has happen, client is dead */
+ res = ast_poll(fds, 1, (keep_alive * 1100)); /* If nothing has happen, client is dead */
/* we add 10% to the keep_alive to deal */
/* with network delays, etc */
if (res < 0) {
Modified: team/twilson/calendaring/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/configure.ac?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/configure.ac (original)
+++ team/twilson/calendaring/configure.ac Tue Mar 17 23:02:14 2009
@@ -43,6 +43,9 @@
fi
CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
+ ;;
+ darwin*)
+ AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.])
;;
*)
ac_default_prefix=/usr
@@ -305,6 +308,10 @@
AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
AC_CHECK_HEADERS([winsock.h winsock2.h])
+
+AC_CHECK_HEADER([sys/poll.h],
+ [],
+ AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]))
AC_SYS_LARGEFILE
Modified: team/twilson/calendaring/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/include/asterisk/autoconfig.h.in?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/include/asterisk/autoconfig.h.in (original)
+++ team/twilson/calendaring/include/asterisk/autoconfig.h.in Tue Mar 17 23:02:14 2009
@@ -6,6 +6,9 @@
#include "asterisk/buildopts.h"
+
+/* Define to 1 if internal poll should be used. */
+#undef AST_POLL_COMPAT
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
Modified: team/twilson/calendaring/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/include/asterisk/channel.h?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/include/asterisk/channel.h (original)
+++ team/twilson/calendaring/include/asterisk/channel.h Tue Mar 17 23:02:14 2009
@@ -125,11 +125,7 @@
#include "asterisk/abstract_jb.h"
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#else
#include "asterisk/poll-compat.h"
-#endif
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
Modified: team/twilson/calendaring/include/asterisk/io.h
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/include/asterisk/io.h?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/include/asterisk/io.h (original)
+++ team/twilson/calendaring/include/asterisk/io.h Tue Mar 17 23:02:14 2009
@@ -23,11 +23,7 @@
#ifndef _ASTERISK_IO_H
#define _ASTERISK_IO_H
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h> /* For POLL* constants */
-#else
#include "asterisk/poll-compat.h"
-#endif
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
Modified: team/twilson/calendaring/include/asterisk/poll-compat.h
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/include/asterisk/poll-compat.h?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/include/asterisk/poll-compat.h (original)
+++ team/twilson/calendaring/include/asterisk/poll-compat.h Tue Mar 17 23:02:14 2009
@@ -76,8 +76,16 @@
original.
\*---------------------------------------------------------------------------*/
-#ifndef _POLL_EMUL_H_
-#define _POLL_EMUL_H_
+#ifndef __AST_POLL_COMPAT_H
+#define __AST_POLL_COMPAT_H
+
+#ifndef AST_POLL_COMPAT
+
+#include <sys/poll.h>
+
+#define ast_poll(a, b, c) poll(a, b, c)
+
+#else /* AST_POLL_COMPAT */
#define POLLIN 0x01
#define POLLPRI 0x02
@@ -86,26 +94,24 @@
#define POLLHUP 0x10
#define POLLNVAL 0x20
-struct pollfd
-{
+struct pollfd {
int fd;
short events;
short revents;
};
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
-#if (__STDC__ > 0) || defined(__cplusplus)
-extern int poll (struct pollfd *pArray, unsigned long n_fds, int timeout);
-#else
-extern int poll();
-#endif
+#define ast_poll(a, b, c) ast_internal_poll(a, b, c)
+
+int ast_internal_poll(struct pollfd *pArray, unsigned long n_fds, int timeout);
#ifdef __cplusplus
}
#endif
-#endif /* _POLL_EMUL_H_ */
+#endif /* AST_POLL_COMPAT */
+
+#endif /* __AST_POLL_COMPAT_H */
Modified: team/twilson/calendaring/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/Makefile?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/Makefile (original)
+++ team/twilson/calendaring/main/Makefile Tue Mar 17 23:02:14 2009
@@ -29,7 +29,7 @@
strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
astobj2.o hashtab.o global_datastores.o version.o \
features.o taskprocessor.o timing.o datastore.o xml.o xmldoc.o \
- strings.o bridging.o calendar.o
+ strings.o bridging.o poll.o calendar.o
# we need to link in the objects statically, not as a library, because
# otherwise modules will not have them available if none of the static
@@ -43,14 +43,6 @@
AST_LIBS += $(OPENSSL_LIB)
AST_LIBS += $(BKTR_LIB)
AST_LIBS += $(LIBXML2_LIB)
-
-ifeq ($(POLL_AVAILABLE),)
- OBJS+=poll.o
-else
- ifneq ($(findstring darwin,$(OSARCH)),)
- OBJS+=poll.o
- endif
-endif
ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
Modified: team/twilson/calendaring/main/asterisk.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/asterisk.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/asterisk.c (original)
+++ team/twilson/calendaring/main/asterisk.c Tue Mar 17 23:02:14 2009
@@ -137,6 +137,7 @@
#include "asterisk/dsp.h"
#include "asterisk/buildinfo.h"
#include "asterisk/xmldoc.h"
+#include "asterisk/poll-compat.h"
#include "asterisk/doxyref.h" /* Doxygen documentation */
@@ -1213,7 +1214,7 @@
fds[1].events = POLLIN;
fds[1].revents = 0;
- res = poll(fds, 2, -1);
+ res = ast_poll(fds, 2, -1);
if (res < 0) {
if (errno != EINTR)
ast_log(LOG_WARNING, "poll returned < 0: %s\n", strerror(errno));
@@ -1266,7 +1267,7 @@
return NULL;
fds[0].fd = ast_socket;
fds[0].events = POLLIN;
- s = poll(fds, 1, -1);
+ s = ast_poll(fds, 1, -1);
pthread_testcancel();
if (s < 0) {
if (errno != EINTR)
@@ -2081,7 +2082,7 @@
fds[1].events = POLLIN;
max++;
}
- res = poll(fds, max, -1);
+ res = ast_poll(fds, max, -1);
if (res < 0) {
if (sig_flags.need_quit)
break;
@@ -2649,7 +2650,7 @@
fds.fd = ast_consock;
fds.events = POLLIN;
fds.revents = 0;
- while (poll(&fds, 1, 500) > 0) {
+ while (ast_poll(&fds, 1, 500) > 0) {
char buffer[512] = "", *curline = buffer, *nextline;
int not_written = 1;
@@ -3013,7 +3014,7 @@
for (;;) {
struct pollfd p = { sig_alert_pipe[0], POLLIN, 0 };
int a;
- poll(&p, 1, -1);
+ ast_poll(&p, 1, -1);
if (sig_flags.need_reload) {
sig_flags.need_reload = 0;
ast_module_reload(NULL);
Modified: team/twilson/calendaring/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/channel.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/channel.c (original)
+++ team/twilson/calendaring/main/channel.c Tue Mar 17 23:02:14 2009
@@ -2029,12 +2029,12 @@
int kbrms = rms;
if (kbrms > 600000)
kbrms = 600000;
- res = poll(pfds, max, kbrms);
+ res = ast_poll(pfds, max, kbrms);
if (!res)
rms -= kbrms;
} while (!res && (rms > 0));
} else {
- res = poll(pfds, max, rms);
+ res = ast_poll(pfds, max, rms);
}
for (x = 0; x < n; x++)
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
Modified: team/twilson/calendaring/main/io.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/io.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/io.c (original)
+++ team/twilson/calendaring/main/io.c Tue Mar 17 23:02:14 2009
@@ -272,8 +272,9 @@
DEBUG(ast_debug(1, "ast_io_wait()\n"));
- if ((res = poll(ioc->fds, ioc->fdcnt, howlong)) <= 0)
+ if ((res = ast_poll(ioc->fds, ioc->fdcnt, howlong)) <= 0) {
return res;
+ }
/* At least one event tripped */
origcnt = ioc->fdcnt;
Modified: team/twilson/calendaring/main/poll.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/poll.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/poll.c (original)
+++ team/twilson/calendaring/main/poll.c Tue Mar 17 23:02:14 2009
@@ -71,6 +71,8 @@
Includes
\*---------------------------------------------------------------------------*/
+#include "asterisk.h"
+
#include <unistd.h> /* standard Unix definitions */
#include <sys/types.h> /* system types */
#include <sys/time.h> /* time definitions */
@@ -79,6 +81,8 @@
#include "asterisk/poll-compat.h" /* this package */
+#ifdef AST_POLL_COMPAT
+
/*---------------------------------------------------------------------------*\
Macros
\*---------------------------------------------------------------------------*/
@@ -87,7 +91,6 @@
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
-
/*---------------------------------------------------------------------------*\
Private Functions
\*---------------------------------------------------------------------------*/
@@ -203,7 +206,7 @@
return pResult;
}
-
+
static void map_select_results
#if __STDC__ > 0
(struct pollfd *pArray,
@@ -246,22 +249,12 @@
return;
}
-
+
/*---------------------------------------------------------------------------*\
Public Functions
\*---------------------------------------------------------------------------*/
-int poll
-
-#if __STDC__ > 0
- (struct pollfd *pArray, unsigned long n_fds, int timeout)
-#else
- (pArray, n_fds, timeout)
- struct pollfd *pArray;
- unsigned long n_fds;
- int timeout;
-#endif
-
+int ast_internal_poll(struct pollfd *pArray, unsigned long n_fds, int timeout)
{
fd_set read_descs; /* input file descs */
fd_set write_descs; /* output file descs */
@@ -295,3 +288,5 @@
return ready_descriptors;
}
+
+#endif /* AST_POLL_COMPAT */
Modified: team/twilson/calendaring/main/utils.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/utils.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/main/utils.c (original)
+++ team/twilson/calendaring/main/utils.c Tue Mar 17 23:02:14 2009
@@ -1054,7 +1054,7 @@
memset(pfd, 0, sizeof(pfd));
pfd[0].fd = fd;
pfd[0].events = POLLIN|POLLPRI;
- return poll(pfd, 1, ms);
+ return ast_poll(pfd, 1, ms);
}
static int ast_wait_for_output(int fd, int timeoutms)
@@ -1068,7 +1068,7 @@
int elapsed = 0;
/* poll() until the fd is writable without blocking */
- while ((res = poll(&pfd, 1, timeoutms - elapsed)) <= 0) {
+ while ((res = ast_poll(&pfd, 1, timeoutms - elapsed)) <= 0) {
if (res == 0) {
/* timed out. */
ast_log(LOG_NOTICE, "Timed out trying to write\n");
Modified: team/twilson/calendaring/res/res_agi.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_agi.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_agi.c (original)
+++ team/twilson/calendaring/res/res_agi.c Tue Mar 17 23:02:14 2009
@@ -814,7 +814,7 @@
pfds[0].fd = s;
pfds[0].events = POLLOUT;
- while ((res = poll(pfds, 1, MAX_AGI_CONNECT)) != 1) {
+ while ((res = ast_poll(pfds, 1, MAX_AGI_CONNECT)) != 1) {
if (errno != EINTR) {
if (!res) {
ast_log(LOG_WARNING, "FastAGI connection to '%s' timed out after MAX_AGI_CONNECT (%d) milliseconds.\n",
Modified: team/twilson/calendaring/res/res_config_ldap.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_config_ldap.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_config_ldap.c (original)
+++ team/twilson/calendaring/res/res_config_ldap.c Tue Mar 17 23:02:14 2009
@@ -1758,7 +1758,7 @@
return CLI_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "LDAP realtime interface",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LDAP realtime interface",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/twilson/calendaring/res/res_config_sqlite.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_config_sqlite.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_config_sqlite.c (original)
+++ team/twilson/calendaring/res/res_config_sqlite.c Tue Mar 17 23:02:14 2009
@@ -1862,7 +1862,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Realtime SQLite configuration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Realtime SQLite configuration",
.load = load_module,
.unload = unload_module,
);
Modified: team/twilson/calendaring/res/res_curl.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_curl.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_curl.c (original)
+++ team/twilson/calendaring/res/res_curl.c Tue Mar 17 23:02:14 2009
@@ -71,5 +71,3 @@
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "cURL Resource Module");
-
-
Modified: team/twilson/calendaring/res/res_jabber.exports
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_jabber.exports?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_jabber.exports (original)
+++ team/twilson/calendaring/res/res_jabber.exports Tue Mar 17 23:02:14 2009
@@ -8,6 +8,7 @@
ast_aji_invite_chat;
ast_aji_join_chat;
ast_aji_send;
+ ast_aji_send_chat;
local:
*;
};
Modified: team/twilson/calendaring/res/res_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_odbc.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_odbc.c (original)
+++ team/twilson/calendaring/res/res_odbc.c Tue Mar 17 23:02:14 2009
@@ -133,7 +133,7 @@
struct ao2_container *obj_container;
};
-struct ao2_container *class_container;
+static struct ao2_container *class_container;
static AST_RWLIST_HEAD_STATIC(odbc_tables, odbc_cache_tables);
Modified: team/twilson/calendaring/res/res_odbc.exports
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_odbc.exports?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_odbc.exports (original)
+++ team/twilson/calendaring/res/res_odbc.exports Tue Mar 17 23:02:14 2009
@@ -1,9 +1,16 @@
{
global:
+ ast_odbc_ast_str_SQLGetData;
ast_odbc_backslash_is_escape;
+ ast_odbc_clear_cache;
+ ast_odbc_direct_execute;
+ ast_odbc_find_column;
+ ast_odbc_find_table;
ast_odbc_prepare_and_execute;
ast_odbc_release_obj;
ast_odbc_request_obj;
+ ast_odbc_request_obj2;
+ ast_odbc_retrieve_transaction_obj;
ast_odbc_sanity_check;
ast_odbc_smart_execute;
local:
Modified: team/twilson/calendaring/res/res_phoneprov.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/res/res_phoneprov.c?view=diff&rev=182879&r1=182878&r2=182879
==============================================================================
--- team/twilson/calendaring/res/res_phoneprov.c (original)
+++ team/twilson/calendaring/res/res_phoneprov.c Tue Mar 17 23:02:14 2009
@@ -1305,7 +1305,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "HTTP Phone Provisioning",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP Phone Provisioning",
.load = load_module,
.unload = unload_module,
.reload = reload,
More information about the svn-commits
mailing list