Skip to content

fix: guard HAVE_MAT_LIVEEVENTINSPECTOR/PRIVACYGUARD against redefinition #1473

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
bmehta001 merged 3 commits into from
Jun 10, 2026
+24 −0
Merged

fix: guard HAVE_MAT_LIVEEVENTINSPECTOR/PRIVACYGUARD against redefinition #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b43dd4
fix: guard HAVE_MAT_LIVEEVENTINSPECTOR/PRIVACYGUARD against redefinition
bmehta001 Jun 10, 2026
c95f312
Merge branch 'main' into bhamehta/fix-config-default-redefine
bmehta001 Jun 10, 2026
2759e07
Merge branch 'main' into bhamehta/fix-config-default-redefine
bmehta001 Jun 10, 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
8 changes: 8 additions & 0 deletions lib/include/mat/config-default-cs4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,16 @@
/* #define HAVE_MAT_EVT_TRACEID */
#define HAVE_MAT_STORAGE
#define HAVE_MAT_DEFAULT_HTTP_CLIENT
// The two macros below are also added on the command line by
// tests/{functests,unittests}/CMakeLists.txt when BUILD_LIVEEVENTINSPECTOR
// / BUILD_PRIVACYGUARD are ON. Guard against -Wmacro-redefined under
// -Werror on Linux/macOS.
#ifndef HAVE_MAT_LIVEEVENTINSPECTOR
#define HAVE_MAT_LIVEEVENTINSPECTOR
#endif
#ifndef HAVE_MAT_PRIVACYGUARD
#define HAVE_MAT_PRIVACYGUARD
#endif
//#define HAVE_MAT_DEFAULT_FILTER
#if defined(_WIN32) && !defined(_WINRT_DLL)
#define HAVE_MAT_NETDETECT
Expand Down
8 changes: 8 additions & 0 deletions lib/include/mat/config-default-exp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,16 @@
/* #define HAVE_MAT_EVT_TRACEID */
#define HAVE_MAT_STORAGE
#define HAVE_MAT_DEFAULT_HTTP_CLIENT
// The two macros below are also added on the command line by
// tests/{functests,unittests}/CMakeLists.txt when BUILD_LIVEEVENTINSPECTOR
// / BUILD_PRIVACYGUARD are ON. Guard against -Wmacro-redefined under
// -Werror on Linux/macOS.
#ifndef HAVE_MAT_LIVEEVENTINSPECTOR
#define HAVE_MAT_LIVEEVENTINSPECTOR
#endif
#ifndef HAVE_MAT_PRIVACYGUARD
#define HAVE_MAT_PRIVACYGUARD
#endif
//#define HAVE_MAT_DEFAULT_FILTER
#if defined(_WIN32) && !defined(_WINRT_DLL)
#define HAVE_MAT_NETDETECT
Expand Down
8 changes: 8 additions & 0 deletions lib/include/mat/config-default.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,16 @@
/* #define HAVE_MAT_EVT_TRACEID */
#define HAVE_MAT_STORAGE
#define HAVE_MAT_DEFAULT_HTTP_CLIENT
// The two macros below are also added on the command line by
// tests/{functests,unittests}/CMakeLists.txt when BUILD_LIVEEVENTINSPECTOR
// / BUILD_PRIVACYGUARD are ON. Guard against -Wmacro-redefined under
// -Werror on Linux/macOS.
#ifndef HAVE_MAT_LIVEEVENTINSPECTOR
#define HAVE_MAT_LIVEEVENTINSPECTOR
#endif
#ifndef HAVE_MAT_PRIVACYGUARD
#define HAVE_MAT_PRIVACYGUARD
#endif
//#define HAVE_MAT_DEFAULT_FILTER
#if defined(_WIN32) && !defined(_WINRT_DLL)
#define HAVE_MAT_NETDETECT
Expand Down
Loading