From 9d796f8563300d26ddd71ba0e6b53b9bba766d54 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Fri, 17 Jan 2025 13:44:47 +0100 Subject: [PATCH] Minor fixes. --- appveyor.yml | 1 - src/Geo-IP/IPFire/src/libloc/libloc.h | 1 + src/test.c | 2 +- src/wsock_trace_lua.c | 2 +- src/wsock_trace_lua.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 21f2f4f8..cc9455c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,6 @@ build_script: - cmd: cd src - cmd: set USE_LUAJIT=1 - cmd: set PLATFORM=%CPU% - - cmd: nmake -nologo -f Makefile.vc6 test_script: diff --git a/src/Geo-IP/IPFire/src/libloc/libloc.h b/src/Geo-IP/IPFire/src/libloc/libloc.h index 16e497b8..f44bf148 100644 --- a/src/Geo-IP/IPFire/src/libloc/libloc.h +++ b/src/Geo-IP/IPFire/src/libloc/libloc.h @@ -18,6 +18,7 @@ #define LIBLOC_H #if defined(_WIN32) + #include #include #include #include diff --git a/src/test.c b/src/test.c index 63b25e90..7dfd9636 100644 --- a/src/test.c +++ b/src/test.c @@ -1317,7 +1317,7 @@ static void set_colour (int col) if (use_SGR == -1 && use_wincon == -1) /* Do this once */ { - use_SGR = on_appveyor ? 1: 0; + use_SGR = on_appveyor ? 1 : 0; c_hnd = GetStdHandle (STD_OUTPUT_HANDLE); if (c_hnd != INVALID_HANDLE_VALUE && GetConsoleScreenBufferInfo(c_hnd, &c_info)) use_wincon = 1; diff --git a/src/wsock_trace_lua.c b/src/wsock_trace_lua.c index 7a52a392..9fa09453 100644 --- a/src/wsock_trace_lua.c +++ b/src/wsock_trace_lua.c @@ -164,7 +164,7 @@ static const char *get_func_sig (void) strcpy (buf, wslua_func_sig); -#if !(defined(_MSC_VER) && defined(__FUNCSIG__)) +#if !defined(__FUNCSIG__) strcat (buf, "()"); #endif return (buf); diff --git a/src/wsock_trace_lua.h b/src/wsock_trace_lua.h index 0b5bcb3e..d87f20b1 100644 --- a/src/wsock_trace_lua.h +++ b/src/wsock_trace_lua.h @@ -15,7 +15,7 @@ extern int wslua_WSAStartup (WORD ver, WSADATA *data); extern int wslua_WSACleanup (void); - #if defined(_MSC_VER) && defined(__FUNCSIG__) + #if defined(__FUNCSIG__) /* * MSVC supports '__FUNCSIG__' and includes full list of arguments. * E.g. in 'void foo(int bar)', __FUNCSIG__' gives "void foo(int bar)".