summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-06-19 12:23:59 +0000
committerBenny Prijono <bennylp@teluu.com>2006-06-19 12:23:59 +0000
commitc22eab725a2a8a1ac809b981de6e8c548ad7e553 (patch)
tree1153b008ba84c1f6bbc0c064cf009e4a591f8451
parent304937f34434be876cb17919d3dbf846f9ef7623 (diff)
Fixed pjmedia build errors in the Makefile with the new gsm patchlevel
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@525 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/build/Makefile8
-rw-r--r--pjmedia/src/pjmedia-codec/gsm/code.c1
-rw-r--r--pjmedia/src/pjmedia-codec/gsm/config.h12
3 files changed, 11 insertions, 10 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 898d4a09..2375aa35 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -92,13 +92,13 @@ SPEEX_OBJS := speex_codec.o \
speex/bits.o speex/cb_search.o speex/exc_10_16_table.o \
speex/exc_10_32_table.o speex/exc_20_32_table.o \
speex/exc_5_256_table.o speex/exc_5_64_table.o \
- speex/exc_8_128_table.o speex/fftwrap.c speex/filters.o \
+ speex/exc_8_128_table.o speex/fftwrap.o speex/filters.o \
speex/gain_table.o speex/gain_table_lbr.o \
speex/hexc_10_32_table.o speex/hexc_table.o \
- speex/high_lsp_tables.o speex/jitter.c \
- speex/kiss_fft.c speex/kiss_fftr.c speex/lpc_spx.o \
+ speex/high_lsp_tables.o speex/jitter.o \
+ speex/kiss_fft.o speex/kiss_fftr.o speex/lpc_spx.o \
speex/lsp.o speex/lsp_tables_nb.o speex/ltp.o \
- speex/math_approx.o speex/misc.o speex/mdf.c speex/modes.o \
+ speex/math_approx.o speex/misc.o speex/mdf.o speex/modes.o \
speex/nb_celp.o speex/preprocess_spx.o \
speex/quant_lsp.o speex/sb_celp.o speex/smallft.o \
speex/speex.o speex/speex_callbacks.o speex/speex_header.o \
diff --git a/pjmedia/src/pjmedia-codec/gsm/code.c b/pjmedia/src/pjmedia-codec/gsm/code.c
index 65dd0a33..9b4896ca 100644
--- a/pjmedia/src/pjmedia-codec/gsm/code.c
+++ b/pjmedia/src/pjmedia-codec/gsm/code.c
@@ -9,6 +9,7 @@
#include "config.h"
+#include <string.h>
#ifdef HAS_STDLIB_H
#include <stdlib.h>
#else
diff --git a/pjmedia/src/pjmedia-codec/gsm/config.h b/pjmedia/src/pjmedia-codec/gsm/config.h
index dfb1eadb..110d04b4 100644
--- a/pjmedia/src/pjmedia-codec/gsm/config.h
+++ b/pjmedia/src/pjmedia-codec/gsm/config.h
@@ -9,8 +9,8 @@
#ifndef CONFIG_H
#define CONFIG_H
-/*efine SIGHANDLER_T int /* signal handlers are void */
-/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
+/*efine SIGHANDLER_T int signal handlers are void */
+/*efine HAS_SYSV_SIGNAL 1 sigs not blocked/reset? */
#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
#define HAS_LIMITS_H 1 /* /usr/include/limits.h */
@@ -22,16 +22,16 @@
#define HAS_CHMOD 1 /* chmod syscall */
#define HAS_FCHOWN 1 /* fchown syscall */
#define HAS_CHOWN 1 /* chown syscall */
-/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
+/*efine HAS__FSETMODE 1 _fsetmode -- set file mode */
#define HAS_STRING_H 1 /* /usr/include/string.h */
-/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
+/*efine HAS_STRINGS_H 1 /usr/include/strings.h */
#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */
#define HAS_UTIME 1 /* POSIX utime(path, times) */
-/*efine HAS_UTIMES 1 /* use utimes() syscall instead */
+/*efine HAS_UTIMES 1 use utimes() syscall instead */
#define HAS_UTIME_H 1 /* UTIME header file */
#define HAS_UTIMBUF 1 /* struct utimbuf */
-/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
+/*efine HAS_UTIMEUSEC 1 microseconds in utimbuf? */
#endif /* CONFIG_H */