Revert the previous patch since it's braking compilation

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Martin Pycko
2003-10-16 21:11:29 +00:00
parent d5b54e4b7f
commit 13b7b73b08
10 changed files with 36 additions and 66 deletions

View File

@@ -22,7 +22,6 @@ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
CFLAGS+=-fPIC
CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
LIBG723=g723.1/libg723.a
LIBG723B=g723.1b/libg723b.a
@@ -31,8 +30,7 @@ LIBGSM=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; else echo "
LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
LIBMP3=mp3/libmp3.a
LIBLPC10=lpc10/liblpc10.a
LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
LIBSPEEX+=-lspeex -lm
LIBSPEEX=-lspeex -lm
LIBILBC=ilbc/libilbc.a
CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \

View File

@@ -1,14 +1,14 @@
/*
$Log$
Revision 1.15 2003/10/16 10:44:04 markster
Sane FreeBSD patch
Revision 1.16 2003/10/16 21:11:29 martinp
Revert the previous patch since it's braking compilation
Revision 1.2 2003/10/16 10:44:04 markster
Sane FreeBSD patch
Revision 1.3 2003/10/16 21:11:30 martinp
Revert the previous patch since it's braking compilation
Revision 1.1.1.1 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003
Revision 1.1 2003/02/12 13:59:15 matteo
Initial revision
Revision 1.2 2000/01/05 08:20:39 markster
Some OSS fixes and a few lpc changes to make it actually work
@@ -37,7 +37,7 @@ extern int lpcini_(void);
#include "f2c.h"
#include <stdlib.h>
#include <malloc.h>
/* Common Block Declarations */
@@ -51,14 +51,14 @@ struct {
/* ***************************************************************** */
/* $Log$
* Revision 1.15 2003/10/16 10:44:04 markster
* Sane FreeBSD patch
* Revision 1.16 2003/10/16 21:11:29 martinp
* Revert the previous patch since it's braking compilation
*
/* Revision 1.2 2003/10/16 10:44:04 markster
/* Sane FreeBSD patch
/* Revision 1.3 2003/10/16 21:11:30 martinp
/* Revert the previous patch since it's braking compilation
/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/* Revision 1.1 2003/02/12 13:59:15 matteo
/* Initial revision
/*
/* Revision 1.2 2000/01/05 08:20:39 markster
/* Some OSS fixes and a few lpc changes to make it actually work
@@ -83,14 +83,14 @@ struct {
{
/* $Log$
* Revision 1.15 2003/10/16 10:44:04 markster
* Sane FreeBSD patch
* Revision 1.16 2003/10/16 21:11:29 martinp
* Revert the previous patch since it's braking compilation
*
/* Revision 1.2 2003/10/16 10:44:04 markster
/* Sane FreeBSD patch
/* Revision 1.3 2003/10/16 21:11:30 martinp
/* Revert the previous patch since it's braking compilation
/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/* Revision 1.1 2003/02/12 13:59:15 matteo
/* Initial revision
/*
/* Revision 1.2 2000/01/05 08:20:39 markster
/* Some OSS fixes and a few lpc changes to make it actually work
@@ -115,14 +115,14 @@ struct {
/* LPC Configuration parameters: */
/* Frame size, Prediction order, Pitch period */
/* $Log$
* Revision 1.15 2003/10/16 10:44:04 markster
* Sane FreeBSD patch
* Revision 1.16 2003/10/16 21:11:29 martinp
* Revert the previous patch since it's braking compilation
*
/* Revision 1.2 2003/10/16 10:44:04 markster
/* Sane FreeBSD patch
/* Revision 1.3 2003/10/16 21:11:30 martinp
/* Revert the previous patch since it's braking compilation
/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/* Revision 1.1 2003/02/12 13:59:15 matteo
/* Initial revision
/*
/* Revision 1.2 2000/01/05 08:20:39 markster
/* Some OSS fixes and a few lpc changes to make it actually work

View File

@@ -37,13 +37,6 @@ ____________________________________________________________________________*/
/* #define GLOBAL_GAIN_SCALE 0 */
#ifdef __FreeBSD__
#ifdef __i386__
#undef LITTLE_ENDIAN
#define LITTLE_ENDIAN 1
#endif
#endif
#ifdef _M_IX86
#define LITTLE_ENDIAN 1
#endif