diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-09-14 11:26:37 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-09-14 11:26:37 +0000 |
| commit | 375ad034fbb45b861bcb967a120c23189d30040c (patch) | |
| tree | 6894971014134d0dc674e28b75e436fa7ceda835 | |
| parent | de41ab8738b3c8782e214d48f562d1671dc76691 (diff) | |
Fixed compilation error in Linux when the legacy configure is being used: multiple declaration of socklen_t. Also does similar things with os_sunos, os_darwinos, and os_rtems
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@716 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/include/pj/compat/os_darwinos.h | 3 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_linux.h | 2 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_rtems.h | 3 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_sunos.h | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/pjlib/include/pj/compat/os_darwinos.h b/pjlib/include/pj/compat/os_darwinos.h index e797c438..ce423333 100644 --- a/pjlib/include/pj/compat/os_darwinos.h +++ b/pjlib/include/pj/compat/os_darwinos.h @@ -135,6 +135,9 @@ typedef int socklen_t; */ #define PJ_THREAD_ALLOCATE_STACK 0 +/* Oh well.. MacOS 10.2 doesn't have socklen_t, but 10.4 has! */ +#define PJ_HAS_SOCKLEN_T 0 + #endif /* __PJ_COMPAT_OS_DARWINOS_H__ */ diff --git a/pjlib/include/pj/compat/os_linux.h b/pjlib/include/pj/compat/os_linux.h index f0bef355..cd5acaf8 100644 --- a/pjlib/include/pj/compat/os_linux.h +++ b/pjlib/include/pj/compat/os_linux.h @@ -119,6 +119,8 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 +/* Linux has socklen_t */ +#define PJ_HAS_SOCKLEN_T 1 #endif /* __PJ_COMPAT_OS_LINUX_H__ */ diff --git a/pjlib/include/pj/compat/os_rtems.h b/pjlib/include/pj/compat/os_rtems.h index f764f9be..3f606561 100644 --- a/pjlib/include/pj/compat/os_rtems.h +++ b/pjlib/include/pj/compat/os_rtems.h @@ -128,6 +128,9 @@ typedef int socklen_t; */ #define PJ_THREAD_ALLOCATE_STACK 1 +/* RTEMS has socklen_t (does it? )*/ +#define PJ_HAS_SOCKLEN_T 1 + diff --git a/pjlib/include/pj/compat/os_sunos.h b/pjlib/include/pj/compat/os_sunos.h index 56c48306..d3c9650f 100644 --- a/pjlib/include/pj/compat/os_sunos.h +++ b/pjlib/include/pj/compat/os_sunos.h @@ -122,6 +122,9 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 +/* SunOS has socklen_t (does it? )*/ +#define PJ_HAS_SOCKLEN_T 1 + #endif /* __PJ_COMPAT_OS_SUNOS_H__ */ |