Minor fixes.

gvanem · Jan 17, 2025 · 9d796f8 · 9d796f8
1 parent f23f21c
commit 9d796f8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -18,6 +18,7 @@
 #define LIBLOC_H
 
 #if defined(_WIN32)
+  #include <stdlib.h>
   #include <sys/types.h>
   #include <winsock2.h>
   #include <ws2tcpip.h>

diff --git 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
@@ -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
@@ -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)".