Remove old non-compliant win32 defines.

This commit is contained in:
KimLS
2019-06-22 16:00:06 -07:00
parent 5d138891d8
commit 4ae0f2a1d7
103 changed files with 192 additions and 306 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
SET(world_sources
adventure.cpp
+1 -1
View File
@@ -60,7 +60,7 @@
//#define IPBASED_AUTH_HACK
// Disgrace: for windows compile
#ifdef _WINDOWS
#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
#else
+4 -4
View File
@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../common/crash.h"
#include "client.h"
#include "worlddb.h"
#ifdef _WINDOWS
#ifdef _WIN32
#include <process.h>
#define snprintf _snprintf
#define strncasecmp _strnicmp
@@ -108,7 +108,7 @@ void CatchSignal(int sig_num);
void CheckForServerScript(bool force_download = false);
inline void UpdateWindowTitle(std::string new_title) {
#ifdef _WINDOWS
#ifdef _WIN32
SetConsoleTitle(new_title.c_str());
#endif
}
@@ -160,7 +160,7 @@ int main(int argc, char** argv) {
return 1;
}
#ifndef WIN32
#ifndef _WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
Log(Logs::General, Logs::World_Server, "Could not set signal handler");
return 1;
@@ -604,7 +604,7 @@ void CatchSignal(int sig_num) {
}
void UpdateWindowTitle(char* iNewTitle) {
#ifdef _WINDOWS
#ifdef _WIN32
char tmp[500];
if (iNewTitle) {
snprintf(tmp, sizeof(tmp), "World: %s", iNewTitle);
+1 -1
View File
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef WIN32
#ifndef _WIN32
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>