Skip to content

Commit

Permalink
Use winsock2.h instead of winsock.h (#8778)
Browse files Browse the repository at this point in the history
  - The two can not be simultaneously. The rest of our code (e.g. our
    parsers) use winsock2.h.

    winsock2.h is backwards compatible with winsock.h. Use it as we are
    not possibly targeting anything that does not have winsock2 support.
  • Loading branch information
mahge committed Mar 29, 2022
1 parent a91b842 commit 7468264
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/3rdParty
2 changes: 1 addition & 1 deletion OMCompiler/SimulationRuntime/c/simulation/socket.h
Expand Up @@ -18,7 +18,7 @@
#define SOCKET_H_

#if defined(__MINGW32__) || defined(_MSC_VER)
#include <winsock.h>
#include <winsock2.h>
#else
#include <sys/socket.h>
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/SimulationRuntime/c/simulation/socket_win.inc
Expand Up @@ -15,7 +15,7 @@
*/

#include <cstdlib>
#include <winsock.h>
#include <winsock2.h>
#include <io.h>
#include <iostream>
#include <stdio.h>
Expand Down

0 comments on commit 7468264

Please sign in to comment.