Skip to content

ENT-14193: Fixed cf-watchd build by using CF3_CFLAGS #6234

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
olehermanse merged 2 commits into from
Jul 13, 2026
+4 −1
Merged

ENT-14193: Fixed cf-watchd build by using CF3_CFLAGS #6234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99f61f6
Fixed cf-watchd build by using CF3_CFLAGS
larsewi Jul 13, 2026
bb164ef
Guarded cf-watchd instance check behind !__MINGW32__
larsewi Jul 13, 2026
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
3 changes: 2 additions & 1 deletion cf-watchd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
$(PCRE2_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = $(CF3_CFLAGS) \
$(DEBUG_CFLAGS) \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
2 changes: 2 additions & 0 deletions cf-watchd/cf-watchd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,14 @@ int main(int argc, char **argv)
EvalContext *ctx = EvalContextNew();
GenericAgentConfigApply(ctx, config);

#ifndef __MINGW32__
pid_t existing_pid = ReadPID("cf-watchd.pid");
if ((existing_pid != -1) && (kill(existing_pid, 0) == 0))
{
Log(LOG_LEVEL_ERR, "Another instance of cf-watchd is already running, terminating");
return 1;
}
#endif

#ifdef __MINGW32__

Expand Down
Loading