diff options
Diffstat (limited to 'pjlib/include/pj/compat/socket.h')
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 13 |
1 files changed, 7 insertions, 6 deletions
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 |