diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-10-24 00:00:40 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-10-24 00:00:40 +0000 |
| commit | af73c1c337f9831cf66bc980333b390340f71e39 (patch) | |
| tree | bb95519e2cdb9fdc7472b8bc5bdcc9935c99179e /pjlib | |
| parent | 4bd59f67f28dcf276a0cf85f99ac1719268378b3 (diff) | |
More ticket #972: fixed compilation error on Linux due to the last introduction ot PJ_TCP_NODELAY. Everyone needs to re-run configure though (thanks Dan Arrhenius for the report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2962 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_darwinos.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_symbian.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_win32.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_win32_wince.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 5 |
6 files changed, 10 insertions, 0 deletions
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index 12ca4341..2e8562eb 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -54,6 +54,7 @@ #undef PJ_HAS_NETINET_IN_SYSTM_H #undef PJ_HAS_NETINET_IN_H #undef PJ_HAS_NETINET_IP_H +#undef PJ_HAS_NETINET_TCP_H #undef PJ_HAS_NET_IF_H #undef PJ_HAS_IFADDRS_H #undef PJ_HAS_SEMAPHORE_H diff --git a/pjlib/include/pj/compat/os_darwinos.h b/pjlib/include/pj/compat/os_darwinos.h index d212102f..dc7c6ea7 100644 --- a/pjlib/include/pj/compat/os_darwinos.h +++ b/pjlib/include/pj/compat/os_darwinos.h @@ -35,6 +35,7 @@ #define PJ_HAS_MALLOC_H 0 #define PJ_HAS_NETDB_H 1 #define PJ_HAS_NETINET_IN_H 1 +#define PJ_HAS_NETINET_TCP_H 1 #define PJ_HAS_SETJMP_H 1 #define PJ_HAS_STDARG_H 1 #define PJ_HAS_STDDEF_H 1 diff --git a/pjlib/include/pj/compat/os_symbian.h b/pjlib/include/pj/compat/os_symbian.h index 4879d3d2..ea52e0e2 100644 --- a/pjlib/include/pj/compat/os_symbian.h +++ b/pjlib/include/pj/compat/os_symbian.h @@ -35,6 +35,7 @@ #define PJ_HAS_MALLOC_H 0 #define PJ_HAS_NETDB_H 1 #define PJ_HAS_NETINET_IN_H 1 +#define PJ_HAS_NETINET_TCP_H 0 #define PJ_HAS_SETJMP_H 1 #define PJ_HAS_STDARG_H 1 #define PJ_HAS_STDDEF_H 1 diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index 5e4a3900..c0abf445 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -41,6 +41,7 @@ #define PJ_HAS_MALLOC_H 1 #define PJ_HAS_NETDB_H 0 #define PJ_HAS_NETINET_IN_H 0 +#define PJ_HAS_NETINET_TCP_H 0 #define PJ_HAS_SETJMP_H 1 #define PJ_HAS_STDARG_H 1 #define PJ_HAS_STDDEF_H 1 diff --git a/pjlib/include/pj/compat/os_win32_wince.h b/pjlib/include/pj/compat/os_win32_wince.h index 16cf5808..71838100 100644 --- a/pjlib/include/pj/compat/os_win32_wince.h +++ b/pjlib/include/pj/compat/os_win32_wince.h @@ -40,6 +40,7 @@ #define PJ_HAS_MALLOC_H 1 #define PJ_HAS_NETDB_H 0 #define PJ_HAS_NETINET_IN_H 0 +#define PJ_HAS_NETINET_TCP_H 0 #define PJ_HAS_SETJMP_H 1 #define PJ_HAS_STDARG_H 1 #define PJ_HAS_STDDEF_H 1 diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index a0685874..db3e5faa 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -104,6 +104,11 @@ # include <netinet/ip.h> #endif +#if defined(PJ_HAS_NETINET_TCP_H) && PJ_HAS_NETINET_TCP_H != 0 +/* To pull in TCP_NODELAY constants */ +# include <netinet/tcp.h> +#endif + #if defined(PJ_HAS_NET_IF_H) && PJ_HAS_NET_IF_H != 0 /* For interface enumeration in ip_helper */ # include <net/if.h> |