kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5569 minus lock.h changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-08 04:13:19 +00:00
parent ebf04fc570
commit 0941c32d38
10 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <kpfleming@digium.com> 2005-11-07 Kevin P. Fleming <kpfleming@digium.com>
* many files: more Cygwin compatibility, and proper getloadavg() prototype/macro (issue #5569)
* include/asterisk/lock.h (__ast_pthread_mutex_lock): correct build with DETECT_DEADLOCKS defined (issue #5570) * include/asterisk/lock.h (__ast_pthread_mutex_lock): correct build with DETECT_DEADLOCKS defined (issue #5570)
2005-11-07 Russell Bryant <russell@digium.com> 2005-11-07 Russell Bryant <russell@digium.com>

1
asterisk.c
View File

@@ -107,6 +107,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/version.h" #include "asterisk/version.h"
#include "asterisk/linkedlists.h" #include "asterisk/linkedlists.h"
#include "asterisk/devicestate.h" #include "asterisk/devicestate.h"
#include "asterisk/compat.h"
#include "asterisk/doxyref.h" /* Doxygen documentation */ #include "asterisk/doxyref.h" /* Doxygen documentation */

3
codecs/Makefile
View File

@@ -14,6 +14,8 @@
ifeq (${OSARCH},CYGWIN) ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
CYGSOLIB=-L.. -L. -lasterisk.dll CYGSOLIB=-L.. -L. -lasterisk.dll
else
CFLAGS+=-fPIC
endif endif
ifneq ($(wildcard g723.1/coder.c),) ifneq ($(wildcard g723.1/coder.c),)
@@ -57,7 +59,6 @@ ifneq ($(wildcard ilbc/iLBC_decode.h),)
LIBILBC=ilbc/libilbc.a LIBILBC=ilbc/libilbc.a
endif endif
CFLAGS+=-fPIC
LIBGSM=gsm/lib/libgsm.a LIBGSM=gsm/lib/libgsm.a
LIBGSMT=gsm/lib/libgsm.a LIBGSMT=gsm/lib/libgsm.a

5
codecs/ilbc/Makefile
View File

@@ -1,5 +1,8 @@
ARCH=$(PROC) ARCH=$(PROC)
CFLAGS+=-Wall -fPIC -O3 -funroll-loops CFLAGS+=-Wall -O3 -funroll-loops
ifneq (${OSARCH},CYGWIN)
CFLAGS += -fPIC
endif
LIB=libilbc.a LIB=libilbc.a
OBJS= anaFilter.o iCBSearch.o packing.o \ OBJS= anaFilter.o iCBSearch.o packing.o \

5
codecs/lpc10/Makefile
View File

@@ -22,7 +22,10 @@ LIB_TARGET_DIR = .
# #
WARNINGS = -Wall -Wno-comment -Wno-error WARNINGS = -Wall -Wno-comment -Wno-error
CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS)
ifneq (${OSARCH},CYGWIN)
CFLAGS += -fPIC
endif
#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
#fix for PPC processors and ALPHA, And UltraSparc too #fix for PPC processors and ALPHA, And UltraSparc too

4
include/asterisk/compat.h
View File

@@ -74,6 +74,10 @@ int unsetenv(const char *name);
#define HAVE_VASPRINTF #define HAVE_VASPRINTF
#define HAVE_STRTOQ #define HAVE_STRTOQ
#ifdef _BSD_SOURCE
#define HAVE_GETLOADAVG
#endif
#ifdef __linux__ #ifdef __linux__
#define HAVE_STRCASESTR #define HAVE_STRCASESTR
#define HAVE_STRNDUP #define HAVE_STRNDUP

4
include/asterisk/utils.h
View File

@@ -231,4 +231,8 @@ int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*st
*/ */
char *ast_process_quotes_and_slashes(char *start, char find, char replace_with); char *ast_process_quotes_and_slashes(char *start, char find, char replace_with);
#ifndef HAVE_GETLOADAVG
int getloadavg(double *list, int nelem);
#endif
#endif /* _ASTERISK_UTILS_H */ #endif /* _ASTERISK_UTILS_H */

1
pbx.c
View File

@@ -56,6 +56,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/musiconhold.h" #include "asterisk/musiconhold.h"
#include "asterisk/app.h" #include "asterisk/app.h"
#include "asterisk/devicestate.h" #include "asterisk/devicestate.h"
#include "asterisk/compat.h"
/*! /*!
* \note I M P O R T A N T : * \note I M P O R T A N T :

13
stdtime/localtime.c
View File

@@ -77,6 +77,12 @@ static const char elsieid[] = "@(#)localtime.c 7.57";
#define OPEN_MODE O_RDONLY #define OPEN_MODE O_RDONLY
#endif /* !defined O_BINARY */ #endif /* !defined O_BINARY */
#ifdef SOLARIS
#undef TM_ZONE
#undef TM_GMTOFF
#endif
#ifdef TM_ZONE
#ifndef WILDABBR #ifndef WILDABBR
/*! \note /*! \note
* Someone might make incorrect use of a time zone abbreviation: * Someone might make incorrect use of a time zone abbreviation:
@@ -101,6 +107,7 @@ static const char elsieid[] = "@(#)localtime.c 7.57";
#endif /* !defined WILDABBR */ #endif /* !defined WILDABBR */
static char wildabbr[] = "WILDABBR"; static char wildabbr[] = "WILDABBR";
#endif /* TM_ZONE */
/*! \brief FreeBSD defines 'zone' in 'struct tm' as non-const, so don't declare this /*! \brief FreeBSD defines 'zone' in 'struct tm' as non-const, so don't declare this
string as const. */ string as const. */
@@ -130,12 +137,6 @@ struct lsinfo {
#define MY_TZNAME_MAX 255 #define MY_TZNAME_MAX 255
#endif /* !defined TZNAME_MAX */ #endif /* !defined TZNAME_MAX */
#ifdef SOLARIS
#undef TM_ZONE
#undef TM_GMTOFF
#endif
struct state { struct state {
char name[TZ_STRLEN_MAX + 1]; char name[TZ_STRLEN_MAX + 1];
int leapcnt; int leapcnt;

2
utils.c
View File

@@ -842,7 +842,7 @@ uint64_t strtoq(const char *nptr, char **endptr, int base)
} }
#endif /* !HAVE_STRTOQ */ #endif /* !HAVE_STRTOQ */
#if (!defined(_BSD_SOURCE)) #ifndef HAVE_GETLOADAVG
#ifdef linux #ifdef linux
/* Alternative method of getting load avg on Linux only */ /* Alternative method of getting load avg on Linux only */
int getloadavg(double *list, int nelem) int getloadavg(double *list, int nelem)