diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-05-10 19:24:40 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-05-10 19:24:40 +0000 |
| commit | 50a501dbe89ec8f9a76540015890dd361f1ec8a1 (patch) | |
| tree | a45dac4292320647ed297b35239fccf38eb5885b /pjmedia | |
| parent | 5f10c756ac9d5f48efe2adbcccf5d54634540d61 (diff) | |
Merge-in RTEMS port patch by Phil Torre <ptorre@zetron.com>, alpha release.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@433 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/os-rtems.mak | 7 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm/config.h | 41 | ||||
| -rw-r--r-- | pjmedia/src/test/main.c | 11 |
3 files changed, 39 insertions, 20 deletions
diff --git a/pjmedia/build/os-rtems.mak b/pjmedia/build/os-rtems.mak new file mode 100644 index 00000000..20854409 --- /dev/null +++ b/pjmedia/build/os-rtems.mak @@ -0,0 +1,7 @@ +# +# PJMEDIA OS specific configuration for RTEMS OS target. +# + +export PJMEDIA_OBJS += nullsound.o +export SOUND_OBJS = $(NULLSOUND_OBJS) + diff --git a/pjmedia/src/pjmedia-codec/gsm/config.h b/pjmedia/src/pjmedia-codec/gsm/config.h index 4dd0f274..2603c42c 100644 --- a/pjmedia/src/pjmedia-codec/gsm/config.h +++ b/pjmedia/src/pjmedia-codec/gsm/config.h @@ -9,30 +9,31 @@ #ifndef CONFIG_H #define CONFIG_H -/*efine SIGHANDLER_T int // * signal handlers are void */ -/*efine HAS_SYSV_SIGNAL 1 // * sigs not blocked/reset? */ +//#define SIGHANDLER_T int // * signal handlers are void */ +//#define HAS_SYSV_SIGNAL 1 // * sigs not blocked/reset? */ -#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -/*efine HAS_LIMITS_H 1 // * /usr/include/limits.h */ -#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -/*efine HAS_ERRNO_DECL 1 // * errno.h declares errno */ +#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ +//#define HAS_LIMITS_H 1 // * /usr/include/limits.h */ +#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ +//#define HAS_ERRNO_DECL 1 // * errno.h declares errno */ -#define HAS_FSTAT 1 /* fstat syscall */ -#define HAS_FCHMOD 1 /* fchmod syscall */ -#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 */ +#define HAS_FSTAT 1 /* fstat syscall */ +#define HAS_FCHMOD 1 /* fchmod syscall */ +#define HAS_CHMOD 1 /* chmod syscall */ +#define HAS_FCHOWN 1 /* fchown syscall */ +#define HAS_CHOWN 1 /* chown syscall */ +//#define 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 */ +#define HAS_STRING_H 1 /* /usr/include/string.h */ +//#define 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 */ -#define HAS_UTIME_H 1 /* UTIME header file */ -/*efine HAS_UTIMBUF 1 // * struct utimbuf */ -/*efine HAS_UTIMEUSEC 1 // * microseconds in utimbuf? */ +#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ +#define HAS_UTIME 1 /* POSIX utime(path, times) */ +//#define HAS_UTIMES 1 // * use utimes() syscall instead*/ +#define HAS_UTIME_H 1 /* UTIME header file */ +//#define HAS_UTIMBUF 1 // * struct utimbuf */ +//#define HAS_UTIMEUSEC 1 // * microseconds in utimbuf? */ #endif /* CONFIG_H */ + diff --git a/pjmedia/src/test/main.c b/pjmedia/src/test/main.c index 31acaec7..89d9e659 100644 --- a/pjmedia/src/test/main.c +++ b/pjmedia/src/test/main.c @@ -18,6 +18,17 @@ */ #include "test.h" + +/* Any tests that want to build a linked executable for RTEMS must include + this header to get a default config for the network stack. */ +#if defined(PJ_RTEMS) +# include <bsp.h> +# include <rtems.h> +# include <rtems/rtems_bsdnet.h> +# include "../../../pjlib/include/rtems-network-config.h" +#endif + + int main() { int rc; |