diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
commit | 29f496ef12247a2401d02428fa533020b588f5b6 (patch) | |
tree | 170532911902642fdae405ec644509398b0b6ee5 /include | |
parent | 3cbcc049473cb374710364337d0d415c56133b0e (diff) |
Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk.h | 6 | ||||
-rw-r--r-- | include/asterisk/astmm.h | 2 | ||||
-rw-r--r-- | include/asterisk/compat.h | 35 |
3 files changed, 16 insertions, 27 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index b4546cf70..12c9f9233 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -3,7 +3,7 @@ * * General Definitions for Asterisk top level program * - * Copyright (C) 1999-2005, Mark Spencer + * Copyright (C) 1999-2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -15,11 +15,11 @@ * \brief Asterisk main include file. File version handling, generic pbx functions. */ -#include "asterisk/compat.h" - #ifndef _ASTERISK_H #define _ASTERISK_H +#include "asterisk/compat.h" + #define DEFAULT_LANGUAGE "en" #define DEFAULT_SAMPLE_RATE 8000 diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index 9be9ef95c..b163d7a56 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -20,7 +20,6 @@ * \brief Asterisk memory usage debugging */ -#ifndef NO_AST_MM #ifndef _ASTERISK_ASTMM_H #define _ASTERISK_ASTMM_H @@ -81,4 +80,3 @@ void __ast_mm_init(void); #else #error "NEVER INCLUDE astmm.h DIRECTLY!!" #endif /* _ASTERISK_ASTMM_H */ -#endif diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index de40a140e..3e1b3b3dc 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -1,7 +1,7 @@ /* * Asterisk -- A telephony toolkit for Linux. * - * Copyright (C) 1999-2005, Mark Spencer + * Copyright (C) 1999-2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -16,6 +16,18 @@ #ifndef _COMPAT_H #define _COMPAT_H +#ifndef HAVE_STRSEP +char* strsep(char** str, const char* delims); +#endif + +#ifndef HAVE_SETENV +int setenv(const char *name, const char *value, int overwrite); +#endif + +#ifndef HAVE_UNSETENV +int unsetenv(const char *name); +#endif + #ifdef SOLARIS #define __BEGIN_DECLS #define __END_DECLS @@ -56,9 +68,6 @@ typedef unsigned short u_int16_t; typedef unsigned int u_int32_t; #endif -char* strsep(char** str, const char* delims); -int setenv(const char *name, const char *value, int overwrite); -int unsetenv(const char *name); #endif /* SOLARIS */ #ifdef __CYGWIN__ @@ -71,19 +80,8 @@ int unsetenv(const char *name); #endif #endif /* __CYGWIN__ */ -#define HAVE_ASPRINTF -#define HAVE_VASPRINTF -#define HAVE_STRTOQ - -#ifdef _BSD_SOURCE -#define HAVE_GETLOADAVG -#endif - #ifdef __linux__ #include <inttypes.h> -#define HAVE_STRCASESTR -#define HAVE_STRNDUP -#define HAVE_STRNLEN #endif #ifdef __Darwin__ @@ -94,14 +92,7 @@ int unsetenv(const char *name); #include <sys/types.h> #endif -#ifdef SOLARIS -#undef HAVE_ASPRINTF -#undef HAVE_VASPRINTF -#undef HAVE_STRTOQ -#endif - #ifdef __CYGWIN__ -#undef HAVE_STRTOQ typedef unsigned long long uint64_t; #endif |