From 3bbc6540a9422e072fe890097d9241d994187284 Mon Sep 17 00:00:00 2001 From: ImMahdi Date: Mon, 9 Jun 2025 17:37:24 +0330 Subject: [PATCH] fix SOCKET typdef interference --- server/server.cpp | 2 +- server/server.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server.cpp b/server/server.cpp index da74d04..262a754 100644 --- a/server/server.cpp +++ b/server/server.cpp @@ -273,7 +273,7 @@ void Server::run() { struct sockaddr_in cli_addr; socklen_t clilen; clilen = sizeof(cli_addr); - SOCKET newsc; + _SOCKET newsc; while (true) { newsc = ::accept(sc_, (struct sockaddr*)&cli_addr, &clilen); diff --git a/server/server.hpp b/server/server.hpp index 620273b..0bb9433 100644 --- a/server/server.hpp +++ b/server/server.hpp @@ -12,9 +12,9 @@ #include "route.hpp" #ifdef _WIN32 -typedef unsigned SOCKET; +typedef unsigned _SOCKET; #else -typedef int SOCKET; +typedef int _SOCKET; #endif class TemplateParser; @@ -82,7 +82,7 @@ class Server { }; private: - SOCKET sc_; + _SOCKET sc_; int port_; std::vector routes_; RequestHandler* notFoundHandler_;