kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 292376 via svnmerge from

Browse Source 
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
This commit is contained in:
Tilghman Lesher
2010-10-20 00:41:49 +00:00
parent 54ee79d254
commit 41260a6f20
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_musiconhold.c
View File

@@ -1,7 +1,7 @@
/* /*
* Asterisk -- An open source telephony toolkit. * Asterisk -- An open source telephony toolkit.
* *
* Copyright (C) 1999 - 2006, Digium, Inc. * Copyright (C) 1999 - 2010, Digium, Inc.
* *
* Mark Spencer <markster@digium.com> * Mark Spencer <markster@digium.com>
* *
@@ -27,7 +27,6 @@
/*** MODULEINFO /*** MODULEINFO
<conflict>win32</conflict> <conflict>win32</conflict>
<use>dahdi</use>
***/ ***/
#include "asterisk.h" #include "asterisk.h"