diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-20 00:41:49 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-20 00:41:49 +0000 |
| commit | 41260a6f20dc2a5974e80d2fc3be614ca9c5e8c8 (patch) | |
| tree | fc8e25789b160a095fd8531865c0d16a31a79223 /res | |
| parent | 54ee79d254e5406d6feed57966183e19f507a020 (diff) | |
Merged revisions 292376 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r292376 | tilghman | 2010-10-19 19:40:29 -0500 (Tue, 19 Oct 2010) | 5 lines
Oops. This module uses the generic timer and no longer uses DAHDI.
This causes a problem with the Solaris and other system builds that have gcc
4.1 (where optional_api is non-optional).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index f0ef9b88c..bce86a8e7 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2006, Digium, Inc. + * Copyright (C) 1999 - 2010, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -27,7 +27,6 @@ /*** MODULEINFO <conflict>win32</conflict> - <use>dahdi</use> ***/ #include "asterisk.h" |