From ec95c8da575359c5b79f2f01b573e0a7b818da32 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 10 Jan 2022 15:24:57 -0500 Subject: [PATCH] Rename the monitor type define from CURL to LIBCURL to fix namespace conflict --- src/zm_monitor.cpp | 4 ++-- src/zm_monitor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index e07b872fc..eb82b3f39 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -487,7 +487,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) { } else if ( ! strcmp(dbrow[col], "Libvlc") ) { type = LIBVLC; } else if ( ! strcmp(dbrow[col], "cURL") ) { - type = CURL; + type = LIBCURL; } else if ( ! strcmp(dbrow[col], "VNC") ) { type = VNC; } else { @@ -859,7 +859,7 @@ void Monitor::LoadCamera() { #endif // HAVE_LIBVLC break; } - case CURL: { + case LIBCURL: { #if HAVE_LIBCURL camera = zm::make_unique(this, path.c_str(), diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 0396253ca..4be731c5b 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -76,7 +76,7 @@ public: FILE, FFMPEG, LIBVLC, - CURL, + LIBCURL, NVSOCKET, VNC, } CameraType;