4 files changed, 10 insertions, 4 deletions
diff --git a/res/pjproject/pjlib/include/pj/sock.h b/res/pjproject/pjlib/include/pj/sock.h
index 83d35db9b..0f8850d3b 100644
--- a/res/pjproject/pjlib/include/pj/sock.h
+++ b/res/pjproject/pjlib/include/pj/sock.h
@@ -471,6 +471,7 @@ typedef enum pj_socket_sd_type
  */
 #define PJ_INVALID_SOCKET   (-1)
 
+#ifndef _ASTERISK_H
 /* Must undefine s_addr because of pj_in_addr below */
 #undef s_addr
 
@@ -482,6 +483,11 @@ typedef struct pj_in_addr
     pj_uint32_t	s_addr;		/**< The 32bit IP address.	    */
 } pj_in_addr;
 
+#else
+#include <sys/types.h>
+#include <netinet/in.h>
+typedef struct in_addr pj_in_addr;
+#endif
 
 /**
  * Maximum length of text representation of an IPv4 address.
@@ -675,7 +681,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);
  *
  * @return	nonzero if the address is valid, zero if not.
  */
-PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp);
+PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp);
 
 /**
  * This function converts an address in its standard text presentation form
diff --git a/res/pjproject/pjlib/src/pj/sock_bsd.c b/res/pjproject/pjlib/src/pj/sock_bsd.c
index 9bd0356f7..3bd7121ba 100644
--- a/res/pjproject/pjlib/src/pj/sock_bsd.c
+++ b/res/pjproject/pjlib/src/pj/sock_bsd.c
@@ -232,7 +232,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
 {
     char tempaddr[PJ_INET_ADDRSTRLEN];
 
diff --git a/res/pjproject/pjlib/src/pj/sock_linux_kernel.c b/res/pjproject/pjlib/src/pj/sock_linux_kernel.c
index 89c2f0e04..c7a80972d 100644
--- a/res/pjproject/pjlib/src/pj/sock_linux_kernel.c
+++ b/res/pjproject/pjlib/src/pj/sock_linux_kernel.c
@@ -147,7 +147,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr in)
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *ccp, struct pj_in_addr *addr)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *ccp, pj_in_addr *addr)
 {
     pj_uint32_t val;
     int base, n;
diff --git a/res/pjproject/pjlib/src/pj/sock_symbian.cpp b/res/pjproject/pjlib/src/pj/sock_symbian.cpp
index 09239b07a..e72bbdad7 100644
--- a/res/pjproject/pjlib/src/pj/sock_symbian.cpp
+++ b/res/pjproject/pjlib/src/pj/sock_symbian.cpp
@@ -299,7 +299,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
 {
     enum { MAXIPLEN = PJ_INET_ADDRSTRLEN };