diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:13:03 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:13:03 +0000 |
| commit | f20ef313d021be53e18c2adf115226abfeae3ebb (patch) | |
| tree | fa512b8c4fbb7e6982abc15fef636b23b96bd281 /main | |
| parent | 067a66abdd994649f83cfb06f353bb5b3f0d698d (diff) | |
Merged revisions 209760-209761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines
Merged revisions 209759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
Minor changes inspired by testing with latest GCC.
The latest GCC (what will become 4.5.x) has a few new warnings, that in these
cases found some either downright buggy code, or at least seriously poorly
designed code that could be improved.
........
................
r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line
Revert accidental Makefile change.
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@209762 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 2 | ||||
| -rw-r--r-- | main/event.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 5643fb357..f147abd66 100644 --- a/main/Makefile +++ b/main/Makefile @@ -102,7 +102,7 @@ editline/libedit.a: CHECK_SUBDIR $(MAKE) -C editline libedit.a db1-ast/libdb1.a: CHECK_SUBDIR - CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a + _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y diff --git a/main/event.c b/main/event.c index 4479b53f7..b391591c6 100644 --- a/main/event.c +++ b/main/event.c @@ -647,7 +647,7 @@ static int ast_event_dup_and_cache(const struct ast_event *event) int ast_event_queue_and_cache(struct ast_event *event, ...) { va_list ap; - enum ast_event_type ie_type; + enum ast_event_ie_type ie_type; uint16_t host_event_type; struct ast_event_ref *event_ref; int res; |