From: Steinar H. Gunderson Date: Wed, 29 Nov 2023 16:00:35 +0000 (+0100) Subject: Fix compilation with SRT and CEF together (macro conflict via sys/syslog.h). X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=9400e0e0e057e5dd2165401d729a500ef476f356 Fix compilation with SRT and CEF together (macro conflict via sys/syslog.h). --- diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index ca16dab..736ceb2 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -35,6 +35,8 @@ #include "bmusb/bmusb.h" #include "bmusb/fake_capture.h" #ifdef HAVE_CEF +#undef LOG_INFO +#undef LOG_WARNING #include "cef_capture.h" #endif #include "chroma_subsampler.h"