remove the uses of the deprecated STANDARD_LOCAL_USER

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10241 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 0f3b157c3814fa5c966b5c716ebf6ec954da6275..f884e8cc1fe97c5c9f05fbe5b76b3d7ed803a997 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -61,8 +61,6 @@ static char *descrip =
 "  ADSIProg(script): This application programs an ADSI Phone with the given\n"
 "script. If nothing is specified, the default script (asterisk.adsi) is used.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 struct adsi_event {

diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index e7310ef23162833fd2c1f4af04b9ffe85db04a35..517f57f6f9c21f17f5f34c4eca75e402f056c791 100644 (file)
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -95,16 +95,10 @@ static char event_app[128] = {'\0'};
 static char db_family[128] = {'\0'};
 static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"};
 
-
 /* Misc variables */
-
        
 static char event_file[14] = "/event-XXXXXX";
 
-
-
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 /*

diff --git a/apps/app_amd.c b/apps/app_amd.c
index bcbacb55feb78e2c985629fe8bc9d8c8c0e10a5f..e32b1ea544db75bedd3bae680948e937413c20fb 100644 (file)
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -70,8 +70,6 @@ static char *descrip =
 "               LONGGREETING-<%d voiceDuration>-<%d greeting>\n";
 
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 #define STATE_IN_WORD       1

diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 3dd27fe1139fdff0a495f036f4d0bc1791586197..89087a4777baaf548f6c8d53aff477f7a5d186f5 100644 (file)
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -92,8 +92,6 @@ static char *descrip =
 "         Defaults to 0 - no limit - wait for the user press the '#' key.\n"
 ;
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int auth_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 3a457e60b6e0cc3f69cf79b4cf5fb2d56c0bd30f..663a1722e099507264dc7dd132476202d7f7aaae 100644 (file)
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -46,8 +46,6 @@ static char *nocdr_descrip =
 static char *nocdr_app = "NoCDR";
 static char *nocdr_synopsis = "Tell Asterisk to not maintain a CDR for the current call";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int nocdr_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 399ae428d2cc0ec5b2940440e63d35848c557f73..03d119d6e71e61545c66f813d3dc334dc1aaac9f 100644 (file)
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -65,8 +65,6 @@ static char *descrip =
 "    s - Consider the channel unavailable if the channel is in use at all\n"
 "    j - Support jumping to priority n+101 if no channel is available\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int chanavail_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 1d828d59babe44dfecc052ac514943f4a8b92481..88637f7be0e36971d7dbcfd3f80245e05e84b473 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -107,7 +107,6 @@ AST_APP_OPTIONS(chanspy_opts, {
        AST_APP_OPTION_ARG('r', OPTION_RECORD, OPT_ARG_RECORD),
 });
 
-STANDARD_LOCAL_USER;
 LOCAL_USER_DECL;
 
 struct chanspy_translation_helper {

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index ceb345cd556b0c7779c07aa2da99d2e4a377a563..7d24eb9d91a13ced8f9d39d6e9adcbb2425d618c 100644 (file)
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -68,8 +68,6 @@ static const char *descrip =
 "  CPLAYBACKSTATUS -  This variable contains the status of the attempt as a text\n"
 "                     string, one of: SUCCESS | USERSTOPPED | ERROR\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int is_on_phonepad(char key)

diff --git a/apps/app_curl.c b/apps/app_curl.c
index 0432854a5877c39e8734d8a7ed052443a5d1c282..7c42d701a1a76a52364af09a24bd2cd7e3e17f81 100644 (file)
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 static char *tdesc = "Load external URL";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 struct MemoryStruct {

diff --git a/apps/app_db.c b/apps/app_db.c
index 3eafca591f0beddc49d6e483c33187cc42ebc892..665d96a1a0c253389f4d4a61cf126f443ec2a94e 100644 (file)
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -64,8 +64,6 @@ static char *dt_app = "DBdeltree";
 static char *d_synopsis = "Delete a key from the database";
 static char *dt_synopsis = "Delete a family or keytree from the database";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int deltree_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_dial.c b/apps/app_dial.c
index cfe25b81bf2d46c2816c92642e0da7e43436bb23..20726e13462be15765bfef4229014d191096311c 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -271,7 +271,6 @@ struct dial_localuser {
 };
 
 LOCAL_USER_DECL;
-STANDARD_LOCAL_USER;
 
 static void hanguptree(struct dial_localuser *outgoing, struct ast_channel *exception)
 {

diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 20fec3c98161d5e15ca93926d159dcb8db84878f..e27ce7900d416813554969aa1496eb36b2d21e49 100644 (file)
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -52,8 +52,6 @@ static char *synopsis = "Virtual Dictation Machine";
 static char *desc = "  Dictate([<base_dir>[|<filename>]])\n"
 "Start dictation machine using optional base dir for files.\n";
 
-
-STANDARD_LOCAL_USER;
 LOCAL_USER_DECL;
 
 typedef enum {

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 45f3f4a892b6b3dbf56b705b1ce786a228a70703..3255ade9f7d8dfb78380d4c2ae459dd6891425ce 100644 (file)
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -50,8 +50,6 @@ static const char *descrip =
 "that is calling the specified extension. If no context is specified, the current\n"
 "context will be used.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int pickup_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_directory.c b/apps/app_directory.c
index d3225018795ac7ee7036d16694d13fa710bfba72..1935a0ca848e0f6a04755163cb0bda5d142b9168 100644 (file)
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -76,8 +76,6 @@ static char *descrip =
 /* How many digits to read in */
 #define NUMDIGITS 3
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char *convert(char *lastname)

diff --git a/apps/app_disa.c b/apps/app_disa.c
index 1c8cb6732f1334d5301cd8ffa401e75143fda259..12c34ff2fa29169afc70d21800385208d1492504 100644 (file)
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -97,8 +97,6 @@ static char *descrip =
        "exists in the context, it will be used. Also, if you set the 5th argument\n"
        "to 'NOANSWER', the DISA application will not answer initially.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static void play_dialtone(struct ast_channel *chan, char *mailbox)

diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index fbb2d82a45c3270145f568353254e0a274809e3a..115f149c47d9ab92392c41035c6b02ab03d1ca6f 100644 (file)
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -56,8 +56,6 @@ static char *desc =
 "displayed when the verbose level is currently set to that number\n"
 "or greater. \n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)

diff --git a/apps/app_echo.c b/apps/app_echo.c
index c6dc8e54c4b7f28ddf1c72f27616f57e17d76417..61a1261089e356ec21faa18eb8958025c9250d22 100644 (file)
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -52,8 +52,6 @@ static char *descrip =
 "the calling channel back to itself. If the DTMF digit '#' is received, the\n"
 "application will exit.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int echo_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_exec.c b/apps/app_exec.c
index 9f8390d5c20231d1194b82cfeb6a2d8ca60fc7f7..3b1f30a4f37d39facec913e85993af8411721f6c 100644 (file)
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -56,8 +56,6 @@ static char *exec_descrip =
 "see the application System. Returns whatever value the\n"
 "app returns or a non-zero value if the app cannot be found.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int exec_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 0e7cd0f37c19527fde3a5abc8807832b8bd889d0..2f62e51d520cfe88fb15353640dd050f7413086b 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -85,7 +85,6 @@ struct ivr_localuser {
 };
 
 LOCAL_USER_DECL;
-STANDARD_LOCAL_USER;
 
 struct gen_state {
        struct ivr_localuser *u;

diff --git a/apps/app_festival.c b/apps/app_festival.c
index e00fce61823cac862492fa4a5666a41068f5b573..a42037041cdd9e1bf4808daadb735516570e80c0 100644 (file)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -69,8 +69,6 @@ static char *descrip =
 "play it to the user, allowing any given interrupt keys to immediately terminate and return\n"
 "the value, or 'any' to allow any number back (useful in dialplan)\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char *socket_receive_file_to_buff(int fd,int *size)

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 84ed38934b8e43dfcd44f7301b9c1665cfe7db9a..07cff8bcef464c43d401b38ceca7eda478ddf557 100644 (file)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -61,8 +61,6 @@ static char *descrip =
 "people who want to perform transfers and such via AGI and is generally\n"
 "quite useless oths application will only work on Zap trunks.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static inline int zt_wait_event(int fd)

diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 9b29df765d1f9c468011ae14fe550686de382b37..1dcec262a094ec4aeec5d0d299cb8f5dfcb0d4a7 100644 (file)
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -52,9 +52,6 @@ static char *descrip =
 "If the option 'v' is passed all cdr variables will be passed along also.\n"
 "";
 
-
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static void ast_cdr_fork(struct ast_channel *chan) 

diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index b88104ee5de0402029befe07ad8e78465d1ce08a..1e06fae6e6b4a902e105c3aa5d658d3eb6105759 100644 (file)
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -53,8 +53,6 @@ static char *descrip =
 "  GetCPEID: Obtains and displays ADSI CPE ID and other information in order\n"
 "to properly setup zapata.conf for on-hook operations.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int cpeid_setstatus(struct ast_channel *chan, char *stuff[], int voice)

diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index f34e60372eee0c566ba6975db8fa49792f5ceaed..2bbe2f9967901800e0b17563e28f0ccbf6e820d3 100644 (file)
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -78,8 +78,6 @@ static char *hasnewvoicemail_descrip =
 "      HASVMSTATUS             The result of the new voicemail check returned as a text string as follows\n"
 "              <# of messages in the folder, 0 for NONE>\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int hasvoicemail_internal(char *context, char *box, char *folder)

diff --git a/apps/app_ices.c b/apps/app_ices.c
index a8527b309ead3b49568daeb56f141a33772e0a94..7062eea2645cee4d10f8b209543a27e4e0fef4a9 100644 (file)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -61,8 +61,6 @@ static char *descrip =
 "(available separately).  A configuration file must be supplied\n"
 "for ices (see examples/asterisk-ices.conf). \n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int icesencode(char *filename, int fd)

diff --git a/apps/app_image.c b/apps/app_image.c
index 75cb346530cb01f8d075184d159c68a41287503f..b1d3dee8c206bf3f859290fcccd9694e90a757ab 100644 (file)
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -61,8 +61,6 @@ static char *descrip =
 "      SENDIMAGESTATUS         The status is the result of the attempt as a text string, one of\n"
 "              OK | NOSUPPORT \n";                     
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int sendimage_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 8c5b308bf87de7e4d5df5651f392766712255412..dff1220db8bfcc6b161b8098be806aa5b9541874 100644 (file)
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -84,8 +84,6 @@ AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0,
        { NULL },
 });
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int skel_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index ec88931c6cefa2f0d21e80bb19ef5698584ef4c5..da8019389f53cb60ac59a30f18525e98eece4ec1 100644 (file)
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -63,8 +63,6 @@ static char *descrip =
   "            FOUND | NOTFOUND\n"
   "Example: exten => 1234,1,LookupBlacklist()\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int

diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index 90341a4248e216bc4f288a1a25354445e7b781a6..dfdea495a23d3f4fdb8858fe5e2487488d0a53de 100644 (file)
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -59,8 +59,6 @@ static char *descrip =
   "name delivery, or if you want to change the names on some incoming\n"
   "calls.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 922fc23edac98cf319641fc4f6170245d818901f..42c6cf658c5b4870d2cf6fabb5f46fa758fe97c2 100644 (file)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -85,8 +85,6 @@ static char *synopsis = "Macro Implementation";
 static char *if_synopsis = "Conditional Macro Implementation";
 static char *exit_synopsis = "Exit From Macro";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int macro_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0b56add347c1c1591c535e1376921bd70202f42c..efe05722878b7ba40619213e934e6fa84820c858 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -132,8 +132,6 @@ static const char *descrip3 =
 
 #define CONFIG_FILE_NAME "meetme.conf"
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 struct ast_conference {

diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index ac2c51e33d97c99bd20b359ed489d9175f5c6e2b..69fc3887fd64b05c32c93b327cc74aae9f0d46fb 100644 (file)
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -52,8 +52,6 @@ static char *synopsis = "Generate a Constant 1000Hz tone at 0dbm (mu-law)";
 static char *descrip = 
 "Milliwatt(): Generate a Constant 1000Hz tone at 0dbm (mu-law)\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char digital_milliwatt[] = {0x1e,0x0b,0x0b,0x1e,0x9e,0x8b,0x8b,0x9e} ;

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index acc882502872efddb79f6e6bd4b2c39fa695836f..9febe75b9836cc619ba465ea3b79b20b0e22dec6 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -80,8 +80,6 @@ static const char *desc = ""
 "The variable MIXMONITOR_FILENAME will contain the filename used to record.\n"
 "";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static const char *mixmonitor_spy_type = "MixMonitor";

diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 8aae89e774441ddd1d9d8ec903a9848158aa70e2..64bac4a9619db89689f58ad832d95f2d2c2f42e7 100644 (file)
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -54,8 +54,6 @@ static char *morsecode_descrip =
 "(defaults to 80).  Additionally, if MORSETONE is set, it will use that tone\n"
 "(in Hz).  The tone default is 800.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char *morsecode[] = {

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 943163c5e8e675df4aa04da519912fffea12f984..9bd5004b34d23f10911f8225c4ae94a903d898f6 100644 (file)
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -60,8 +60,6 @@ static char *descrip =
 "which typically would be a filename or a URL. User can exit by pressing\n"
 "any key on the dialpad, or by hanging up."; 
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int mp3play(char *filename, int fd)

diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index f41fc04f5f7181560f3b92faf87846561a639c5a..5380d3091abe84604042e50813ba107aeb2129be 100644 (file)
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -64,8 +64,6 @@ static char *descrip =
 "  NBScat: Executes nbscat to listen to the local NBS stream.\n"
 "User can exit by pressing any key\n.";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int NBScatplay(int fd)

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index e9b916c6d55e244ea15e97d3793c4bf5e7818fa0..266c66dda4812ab271c9bd04810c020787b20cff 100644 (file)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -96,8 +96,6 @@ static char *descrip3 =
 "      OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n"
 "              SUCCESS | FAILED \n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int str2cause(char *cause)

diff --git a/apps/app_page.c b/apps/app_page.c
index cc10700bca09da2ec4b11dbbe2c8ca04805ada3a..d848fb875d3cd51444d66fe7bec990715e4f7333 100644 (file)
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -60,8 +60,6 @@ static const char *page_descrip =
 "        d - full duplex audio\n"
 "       q - quiet, do not play beep to caller\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 enum {

diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index b8481b23da23c1ec0e03dc1f7ffcb542b906ce9c..8382f76d589a8ae690dd77739085d26fa50880e4 100644 (file)
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -75,9 +75,6 @@ static char *descrip =
 "call was placed.  Use with the Local channel to allow the dialplan to make\n"
 "use of this information.\n";
 
-
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int parkandannounce_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_playback.c b/apps/app_playback.c
index 2023308ba97568b5114af1570eb4b81b78535530..89d8f9877d2b133cd861cf96899c3adcc6597662 100644 (file)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -66,8 +66,6 @@ static char *descrip =
 "               SUCCESS | FAILED\n"
 ;
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int playback_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 2503b82f39fb7986b047d3e68502acb463f5754e..35502009a6ab4757d28b2cb65bf6b057a9810a2b 100644 (file)
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -76,12 +76,8 @@ static char *descrip =
   "          SUCCESS | FAILED \n"
 ;
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
-
-
 static int privacy_exec (struct ast_channel *chan, void *data)
 {
        int res=0;

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 9d15486173035572d8f79386a03543fa6ea95bec..158fc7825720941fc6c95d2c1a9934009c546162 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -272,8 +272,6 @@ struct callattempt {
        struct member *member;
 };
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 struct queue_ent {

diff --git a/apps/app_random.c b/apps/app_random.c
index 6cd17dd78d0371fa9b239b3ed481255cb3e6595e..a7ff1f3a07b04652d8c5401208b29c558c397bab 100644 (file)
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -52,8 +52,6 @@ static char *random_descrip =
 "  probability := INTEGER in the range 1 to 100\n"
 "DEPRECATED: Use GotoIf($[${RAND(1,100)} > <number>]?<label>)\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int random_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_read.c b/apps/app_read.c
index 461ad995eca04c9e10b22b558bad10242ba32ede..889fc9d31014ebf046e95afdad80978beca8f35b 100644 (file)
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -82,8 +82,6 @@ static char *descrip =
 "  timeout    -- if greater than 0, that value will override the default timeout.\n\n"
 "Read should disconnect if the function fails or errors out.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 #define ast_next_data(instr,ptr,delim) if((ptr=strchr(instr,delim))) { *(ptr) = '\0' ; ptr++;}

diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index f842663ee7fda57a68e65342ccb7b58152f4efc1..4b3f57e9469b4d5d78b10bf86a1c8e9562370f57 100644 (file)
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -54,11 +54,8 @@ static char *readfile_descrip =
 "  File - The name of the file to read.\n"
 "  Length - Maximum number of characters to capture.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
-
 static int readfile_exec(struct ast_channel *chan, void *data)
 {
        int res=0;

diff --git a/apps/app_realtime.c b/apps/app_realtime.c
index 9e83d263840763a998c48a69da116c07588f9f5b..fb0ff0c0326517cac00ff143705ec5a302b41e43 100644 (file)
--- a/apps/app_realtime.c
+++ b/apps/app_realtime.c
@@ -69,7 +69,6 @@ static char *udesc = "Use the RealTime config handler system to update a value\n
 "updated to <newval>.  REALTIMECOUNT will be set with the number of rows\n"
 "updated or -1 if an error occurs.\n";
 
-STANDARD_LOCAL_USER;
 LOCAL_USER_DECL;
 
 static int cli_load_realtime(int fd, int argc, char **argv) 

diff --git a/apps/app_record.c b/apps/app_record.c
index f594947bdd2525099ecd4e03b25d7ca70656d5fb..07167278ce3aedd08d55dd3a61c768d7a840e2f4 100644 (file)
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -72,8 +72,6 @@ static char *descrip =
 "If the user should hangup during a recording, all data will be lost and the\n"
 "application will teminate. \n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int record_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 9deba11c16cb33683229cc24084ebd595a9e5fc2..af3e93533d4fa8367303ab4a79d5209a01814930 100644 (file)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -256,7 +256,6 @@ static char *remote_rig_rbi="rbi";
 
 struct ast_config *cfg;
 
-STANDARD_LOCAL_USER;
 LOCAL_USER_DECL;
 
 #define        MSWAIT 200

diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 9e0a0747def33dd3f8d652b76d46865e27a59881..d3efc010111533ee327faf2855a97cbc19ece238 100644 (file)
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -67,8 +67,6 @@ static char *datetime_descrip =
 "  format:   a format the time is to be said in.  See voicemail.conf.\n"
 "              defaults to \"ABdY 'digits/at' IMp\"\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int sayunixtime_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index b019c96019ea69f1fef997e55f7bc8c7a7314a2a..8b0e90d2efee55d3fe5709973ab4208f89b19a19 100644 (file)
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -56,8 +56,6 @@ static char *descrip =
 " The application will either pass the assigned digits or terminate if it\n"
 " encounters an error.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int senddtmf_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index fea5ebaf94983badc88e2ce03ae4c25cbf9b7ef0..9ed543591ab1663a796b73842a7c709fc8a615ce 100644 (file)
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -65,8 +65,6 @@ static const char *descrip =
 "'j' -- jump to n+101 priority if the channel doesn't support\n"
 "       text transport\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int sendtext_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 7957b05e5942dcb755f598c5327bb1d525b54b9a..2238b33c386aa9f7a3df26fd318a797b8cb35bf0 100644 (file)
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -47,8 +47,6 @@ static char *app2 = "SetCallerPres";
 
 static char *synopsis2 = "Set CallerID Presentation";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char *descrip2 = 

diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c
index 7085855d85ebf84894d7878abb003edc959b2453..a8a31222ede683d4c6098061d87668e473ed1a13 100644 (file)
--- a/apps/app_setcdruserfield.c
+++ b/apps/app_setcdruserfield.c
@@ -74,8 +74,6 @@ static char *appendcdruserfield_descrip =
 static char *appendcdruserfield_app = "AppendCDRUserField";
 static char *appendcdruserfield_synopsis = "Append to the CDR user field";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int action_setcdruserfield(struct mansession *s, struct message *m)

diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c
index 884c3d64bb2024a99202bb6a526025540ae2c3d8..cf9cee314800ec448638169114d3e861fd014fcd 100644 (file)
--- a/apps/app_settransfercapability.c
+++ b/apps/app_settransfercapability.c
@@ -44,8 +44,6 @@ static char *app = "SetTransferCapability";
 
 static char *synopsis = "Set ISDN Transfer Capability";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static struct {        int val; char *name; } transcaps[] = {

diff --git a/apps/app_skel.c b/apps/app_skel.c
index 27c9a7a5013ffb33ae1cef3598001d37b37b9712..f982b6a2df41e56c4052ec61579474f16f6f8be3 100644 (file)
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -61,8 +61,6 @@ AST_DECLARE_OPTIONS(app_opts,{
        ['c'] = { OPTION_C, 2 }
 });
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int app_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_sms.c b/apps/app_sms.c
index c80c0a1f44900c4204acfb1a6faf2f168eb0b78d..eeb20b461e92f3218127ac4c7f5c8fd2478ed954 100644 (file)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -95,8 +95,6 @@ static signed short wave[] = {
 static unsigned char wavea[80];
 #endif
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 /* SMS 7 bit character mapping to UCS-2 */

diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 374de05109ed7ef1260555d97f4c4b407e51cbcf..e95459143d2c0b9ee4719d4b3e10ebeb3da9c72f 100644 (file)
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -54,8 +54,6 @@ static char *desc = "  SoftHangup(Technology/resource|options)\n"
 
 static char *app = "SoftHangup";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int softhangup_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 60aa22f0355abb9d07938f462313f57b5315d215..50888a7d18060c8eca0ff49b2e3fcb920ce31e95 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -67,8 +67,6 @@ static const char *pop_descrip =
 "StackPop()\n"
 "  Removes last label on the stack, discarding it.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int pop_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_system.c b/apps/app_system.c
index 0619b5cf31b2ec6eb3450b3b93f572e523709712..d139e6e6a4da1d72b7fdae453cd8a7ab625987dc 100644 (file)
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -83,8 +83,6 @@ static char *descrip2 =
 "instance, then  the  channel  will  be  setup  to continue at that\n"
 "priority level.  Otherwise, System will terminate.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int system_exec_helper(struct ast_channel *chan, void *data, int failmode)

diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index cd1e680493f658a49fe917a97b6b348658aa8c0e..4c65e75af8ffc3fc87d18ddb53323cc706c71310 100644 (file)
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -60,8 +60,6 @@ static char *descrip =
 "if available.  If unspecified, sil, min, and max default to 1000, 100, and\n"
 "infinity respectively.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int background_detect_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_test.c b/apps/app_test.c
index bc181f86eedca605322e5e350db78e8dc80853c9..8eb93996cf267310fb1735ff72c67a3d52075675 100644 (file)
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static char *tdesc = "Interface Test Application";

diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 6b459353aeace382a45e9eb399fb5b58ff3f5eb4..c9564dbf31386eb8a795f0a588380afb8c464a36 100644 (file)
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -45,8 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/app.h"
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static const char *tdesc = "Transfer";

diff --git a/apps/app_url.c b/apps/app_url.c
index 2b8dccff980794b0619e381f92bd8f4a4467f448..64aa599010ea6eeba88ecdbff665b0c2b0541e20 100644 (file)
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -70,8 +70,6 @@ static char *descrip =
 " SendURL only returns 0 if the URL was sent correctly  or if\n"
 " the channel does not support HTML transport, and -1 otherwise.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int sendurl_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index a62c50b8891f1f4fdaaf3badc3868f02dc81b9e3..523d5827763e4f7d9866058fe57f011ad0f906e8 100644 (file)
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -56,8 +56,6 @@ static char *descrip =
 "If the body is not specified, only Event, Channel, and Uniqueid fields\n"
 "will be present.  Returns 0.";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int userevent_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 72504c6fa565d5c5d1c39d2153f226b10a38411e..c1caf7f22a723c78b2d09eb604c962e499e36534 100644 (file)
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -54,8 +54,6 @@ static char *log_descrip =
 "Log(<level>|<message>)\n"
 "  level must be one of ERROR, WARNING, NOTICE, DEBUG, VERBOSE, DTMF\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int verbose_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 13ad2f786ecaaefb14bc829450abf76fb6e1a4c5..b031525fb4a418da748c1af91c9cf5dc5d44858b 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -430,8 +430,6 @@ static unsigned char adsisec[4] = "\x9B\xDB\xF7\xAC";
 static int adsiver = 1;
 static char emaildateformat[32] = "%A, %B %d, %Y at %r";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static void populate_defaults(struct ast_vm_user *vmu)

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 63fe9c04351f0c9948499f01a028584a601c96ea..8f56e41a942a3171288aab00243b96e3f5d26d46 100644 (file)
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -54,8 +54,6 @@ static char *desc = "  WaitForRing(timeout)\n"
 
 static char *app = "WaitForRing";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int waitforring_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 948c8c756400c1bbcd0cf93000b8dc741149b244..c874bf4a83d16b70b188807a0efbc3e134f8fe99 100644 (file)
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -61,8 +61,6 @@ static char *descrip =
 "  - WaitForSilence(500|2) will wait for 1/2 second of silence, twice\n"
 "  - WaitForSilence(1000) will wait for 1 second of silence, once\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int do_waiting(struct ast_channel *chan, int maxsilence) {

diff --git a/apps/app_while.c b/apps/app_while.c
index cd7053b218737a7f5fcf35d19fd6d225e2bbcbfe..423858a8e122eee77878f2556a6c9f590f1175fa 100644 (file)
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -73,10 +73,6 @@ static char *stop_synopsis = "End A While Loop";
 
 static char *tdesc = "While Loops and Conditional Execution";
 
-
-
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int execif_exec(struct ast_channel *chan, void *data) {

diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 488bfa3b4e2e728ac72022ba628382b61177ca98..b229104d97de53558d535d7bd81c994a9b52705e 100644 (file)
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -56,8 +56,6 @@ static char *descrip =
 "is no callerid information available.  Options should be separated by |\n"
 "characters\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int zapateller_exec(struct ast_channel *chan, void *data)

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 7f28f0679854292366c08cfc4f61b57b27b3ed07..6e3ac754bd2e35eb27904be2902bdc48b1f39c6d 100644 (file)
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -73,12 +73,8 @@ static char *descrip =
 "-1 when caller user hangs up and is independent of the\n"
 "state of the channel being monitored.";
 
-
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
-
 #define CONF_SIZE 160
 
 static int careful_write(int fd, unsigned char *data, int len)

diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index d6960ec170b854c60d7dfdb59538953caa53faa5..c4f54b22ac368a83a4f527d24476bb1060e8012d 100644 (file)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -73,8 +73,6 @@ static char *descrip =
 "Your pppd must be patched to be zaptel aware. Arguments should be\n"
 "separated by | characters.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 #define PPP_MAX_ARGS   32

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 829e3b3c75e870673ec737d1213cb68a2fa54385..8dc6397ee41e01c9f0064614cd0eba596d2aade4 100644 (file)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -71,11 +71,8 @@ static char *descrip =
 "a convenient way.  Use '#' to select the next channel and use '*' to exit\n"
 "Limit scanning to a channel GROUP by setting the option group argument.\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
-
 #define CONF_SIZE 160
 
 static struct ast_channel *get_zap_channel_locked(int num) {

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 71a10f01a0411769d55ca0deab1730d182b6bcc7..b2fc203f915f986e63beeb60140f6d43e29e48ba 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1654,7 +1654,6 @@ static struct ast_cli_entry cli_agent_logoff = {
        { "agent", "logoff", NULL }, agent_logoff_cmd, 
        "Sets an agent offline", agent_logoff_usage, complete_agent_logoff_cmd };
 
-STANDARD_LOCAL_USER;
 LOCAL_USER_DECL;
 
 /*!

diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 753fb8976f86a14d577c96c9a2e8ae86702387a7..f6ced437d58eaa9cbdb7cc4aad63deff802284bb 100644 (file)
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -46,8 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 static char *tdesc = "Cut out information from a string";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 struct sortable_keys {

diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 8d603e4df4dacfe7404f7873f158b6805459b593..51eb61e47dfd8910db2d742db69a8b6791bf610a 100644 (file)
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
  static char *synopsis = "Syntax: ENUMLOOKUP(number[|Method-type[|options[|record#[|zone-suffix]]]])\n";
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int function_enum(struct ast_channel *chan, char *cmd, char *data,

diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 0629246bcdf219c2560422d55585a77d3d6c6914..af5e73a9429581b71af51c117818e6cca256f03c 100644 (file)
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -39,8 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static int acf_rand_exec(struct ast_channel *chan, char *cmd,

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index bce019a8e0444adb8f98196d9aa318990bfd4521..1bafab2d6c5e1d1a589f26dfb8c5d2065e16c397 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -2755,8 +2755,6 @@ static struct ast_cli_entry  cli_precache =
 static struct ast_cli_entry  cli_queryeid =
        { { "dundi", "query", NULL }, dundi_do_query, "Query a DUNDi EID", query_usage };
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 static struct dundi_transaction *create_transaction(struct dundi_peer *p)

diff --git a/res/res_agi.c b/res/res_agi.c
index 2b27e745d0165d164a7ce594e8c1ee42c4da7e8d..5a2e5cc1f0872d13ca9d17b427592cf179a80b89 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -97,11 +97,8 @@ static char *descrip =
 
 static int agidebug = 0;
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
-
 #define TONE_BLOCK_SIZE 200
 
 /* Max time to connect to an AGI remote host */

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 311fa24784acc980130eea53b73419cba08c7bf2..29390af68094690180a4deb8749addc2bb94c1d1 100644 (file)
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 
 static char *tdesc = "ODBC Configuration";
-STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 

diff --git a/res/res_features.c b/res/res_features.c
index d39212131f5abfe5564c2e74c90e0f607c0bf76a..1c4421c00b60bd3c3bc253da6e10293537546ea6 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -142,8 +142,6 @@ AST_MUTEX_DEFINE_STATIC(parking_lock);
 
 static pthread_t parking_thread;
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 char *ast_parking_ext(void)

diff --git a/res/res_odbc.c b/res/res_odbc.c
index f373a9983382586a8dcf4759f4e1ad8bb7e24caa..c6c2fcffb60db6e9cbc2b47c29f5970e120591b3 100644 (file)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -576,8 +576,6 @@ odbc_status odbc_obj_connect(odbc_obj *obj)
        return ODBC_SUCCESS;
 }
 
-STANDARD_LOCAL_USER;
-
 LOCAL_USER_DECL;
 
 int unload_module(void)