aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-14 18:24:12 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-14 18:24:12 +0000
commit6af365b47c5afc46f6a032aa6f4599e08a4fa174 (patch)
treeda20077d0fdeb334c3165d90bafa43ef5479a596 /apps/app_meetme.c
parentdb90e46f5266c3f941e3392ad837b52783892847 (diff)
gcc 4.1.3 wants a union used here.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93041 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c6ba632a4..5107b7f82 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2738,13 +2738,19 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
} else if (!strcasecmp(var->name, "adminopts")) {
ast_copy_string(adminopts, var->value, sizeof(adminopts));
} else if (!strcasecmp(var->name, "endtime")) {
- struct ast_tm tm = { 0, };
- strptime(var->value, "%Y-%m-%d %H:%M:%S", (struct tm *)&tm);
- endtime = ast_mktime(&tm, NULL);
+ union {
+ struct ast_tm atm;
+ struct tm tm;
+ } t = { { 0, }, };
+ strptime(var->value, "%Y-%m-%d %H:%M:%S", &t.tm);
+ endtime = ast_mktime(&t.atm, NULL);
} else if (!strcasecmp(var->name, "starttime")) {
- struct ast_tm tm = { 0, };
- strptime(var->value, "%Y-%m-%d %H:%M:%S", (struct tm *)&tm);
- starttime = ast_mktime(&tm, NULL);
+ union {
+ struct ast_tm atm;
+ struct tm tm;
+ } t = { { 0, }, };
+ strptime(var->value, "%Y-%m-%d %H:%M:%S", &t.tm);
+ starttime = ast_mktime(&t.atm, NULL);
}
var = var->next;