diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
| commit | a9d05ec703ba688539f4978bc47dea878220defe (patch) | |
| tree | 32eaaa9ed24c66cfb82e690bc0af19d72068f2b4 /include | |
| parent | e9d29f7eafbbbd5cbc4ab207be70ff3f96bfaf36 (diff) | |
Merged revisions 125138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines
Merged revisions 125132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines
allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places
don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it
get app_rpt building again after the DAHDI changes
(closes issue #12911)
Reported by: tzafrir
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125146 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/dahdi.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/include/asterisk/dahdi.h b/include/asterisk/dahdi.h deleted file mode 100644 index 0a37b891d..000000000 --- a/include/asterisk/dahdi.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 2007, Digium, Inc. - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - * - * Sometimes one really wonders why we need a copyright - * for less than ten lines of preprocessor directives... - */ - -/*! \file - * \brief Stub to find DAHDI headers -* - * Stub to find the DAHDI headers. The configure script will - * define HAVE_DAHDI_VERSION according to what it has found. - * Applications should include "user.h" and not (directly) - * <foo/user.h> - * For the mapping of version numbers to location see below. - * - */ -#ifndef _AST_DAHDI_H -#define _AST_DAHDI_H - -#ifdef HAVE_DAHDI -#include <sys/ioctl.h> - -/* newer versions install in ${PREFIX}/dahdi */ -#include <dahdi/user.h> -#include <dahdi/tonezone.h> - -#endif /* HAVE_DAHDI */ - -#endif /* _AST_DAHDI_H */ |