diff options
Diffstat (limited to 'pjlib/include')
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 14 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 13 |
2 files changed, 21 insertions, 6 deletions
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index 403d8919..198b940f 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -28,6 +28,19 @@ /* Canonical OS name */ #undef PJ_OS_NAME +/* Legacy macros */ +#undef PJ_WIN32 +#undef PJ_WIN32_WINNT +#undef WIN32_LEAN_AND_MEAN +#undef PJ_DARWINOS +#undef PJ_LINUX +#undef PJ_RTEMS +#undef PJ_SUNOS + +#if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT) +# define _WIN32_WINNT PJ_WIN32_WINNT +#endif + /* Headers availability */ #undef PJ_HAS_ARPA_INET_H #undef PJ_HAS_ASSERT_H @@ -67,6 +80,7 @@ #undef PJ_HAS_SOCKLEN_T #if !defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0 +# define PJ_HAS_SOCKLEN_T 1 typedef int socklen_t; #endif diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index a3715e7d..e95bc125 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -24,14 +24,14 @@ * @brief Provides all socket related functions,data types, error codes, etc. */ -#if defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H != 0 -# include <winsock.h> -#endif - #if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0 # include <winsock2.h> #endif +#if defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H != 0 +# include <winsock.h> +#endif + #if defined(PJ_HAS_SYS_TYPES_H) && PJ_HAS_SYS_TYPES_H != 0 # include <sys/types.h> #endif @@ -124,9 +124,10 @@ /* - * Windows specific + * This will finally be obsoleted, since it should be declared in + * os_auto.h */ -#if defined(PJ_WIN32) || defined(PJ_WIN32_WINCE) +#if !defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0 typedef int socklen_t; #endif |