From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 20 Oct 2010 00:40:29 +0000 (+0000)
Subject: Oops.  This module uses the generic timer and no longer uses DAHDI.
X-Git-Tag: 1.8.1-rc1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ff3d6b761486c71b07516ceaca3b5e0b9744454;p=thirdparty%2Fasterisk.git

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/branches/1.8@292376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index f0ef9b88c6..bce86a8e73 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"