Skip to content

Fix Windows build #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddpbsd merged 4 commits into from
Jan 5, 2017
Merged

Fix Windows build #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32ae1c2
Fix Windows Build
Jan 5, 2017
1b32f6b
Fix Windows Build
Jan 5, 2017
1474469
Fix Window Build
Jan 5, 2017
218ab22
Merge pull request #1 from friedkiwi/fix_windows_build
friedkiwi Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*.a
*.dSYM
.DS_Store
*.dll
*.exe

# Auto generated build files
src/LOCATION
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/logcollector/read_win_event_channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 6 additions & 2 deletions src/rootcheck/check_rc_sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down