Changeset 5815


Ignore:
Timestamp:
Jun 29, 2018 2:49:04 AM (9 months ago)
Author:
nanang
Message:

Misc (re #2059): Fixed compile error on MinGW "Including <winsock2.h> after <winsock.h> is unsupported" (thanks Thibault Groisil for the report).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/os_core_win32.c

    r5758 r5815  
    3131#include <stdio.h> 
    3232 
     33#if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0 
     34#  include <winsock2.h> 
     35#endif 
     36 
    3337#if defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H != 0 
    3438#  include <winsock.h> 
    35 #endif 
    36  
    37 #if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0 
    38 #  include <winsock2.h> 
    3939#endif 
    4040 
Note: See TracChangeset for help on using the changeset viewer.