diff --git a/.gitignore b/.gitignore index b605345b0..1d7ac9bca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ *.a *.dSYM .DS_Store +*.dll +*.exe # Auto generated build files src/LOCATION @@ -71,3 +73,12 @@ src/test_os_regex src/test_os_xml src/test_os_zlib src/test_shared + +# Windows-specific build output: +src/win32/LICENSE.txt +src/win32/default-local_internal_options.conf +src/win32/default-ossec.conf +src/win32/help_win.txt +src/win32/internal_options.conf +src/win32/restart-ossec.cmd +src/win32/route-null.cmd diff --git a/src/logcollector/read_win_event_channel.c b/src/logcollector/read_win_event_channel.c index 60ac84ba1..a0c37194b 100644 --- a/src/logcollector/read_win_event_channel.c +++ b/src/logcollector/read_win_event_channel.c @@ -14,7 +14,7 @@ #define _WIN32_WINNT 0x0600 /* Using Secure APIs */ -#define MINGW_HAS_SECURE_API +#define MINGW_HAS_SECURE_API 1 /* Bookmarks directory */ #define BOOKMARKS_DIR "bookmarks" diff --git a/src/rootcheck/check_rc_sys.c b/src/rootcheck/check_rc_sys.c index d355196ce..b65249c2d 100644 --- a/src/rootcheck/check_rc_sys.c +++ b/src/rootcheck/check_rc_sys.c @@ -256,8 +256,12 @@ static int read_sys_dir(const char *dir_name, int do_read) if (S_ISDIR(statbuf_local.st_mode)) #else if (S_ISDIR(statbuf_local.st_mode) || - S_ISREG(statbuf_local.st_mode) || - S_ISLNK(statbuf_local.st_mode)) + S_ISREG(statbuf_local.st_mode) + /* No S_ISLNK on Windows */ +#ifndef WIN32 + || S_ISLNK(statbuf_local.st_mode) +#endif + ) #endif { entry_count++;