Put back includes needed on FreeBSD. Fixes #3165

src/zm_comms.h

@@ -22,6 +22,7 @@
 
 #include "zm_exception.h"
 #include "zm_logger.h"
+#include <cerrno>
 #include <netdb.h>
 #include <set>
 #include <sys/uio.h>

src/zm_config.cpp

@@ -22,6 +22,7 @@
 #include "zm_db.h"
 #include "zm_logger.h"
 #include "zm_utils.h"
+#include <cerrno>
 #include <cstring>
 #include <dirent.h>
 #include <glob.h>

src/zm_eventstream.cpp

@@ -27,6 +27,9 @@
 #include "zm_storage.h"
 #include <arpa/inet.h>
 #include <sys/stat.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 
 const std::string EventStream::StreamMode_Strings[4] = {
   "None",
@@ -348,7 +351,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
           curr_frame_id = 1;
         } else {
           Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
-              StreamMode_Strings[(int)mode], curr_frame_id, event_data->frame_count );
+              StreamMode_Strings[(int)mode].c_str(), curr_frame_id, event_data->frame_count );
         }
 
         replay_rate = ZM_RATE_BASE;

src/zm_logger.cpp

@@ -21,6 +21,7 @@
 
 #include "zm_db.h"
 #include "zm_utils.h"
+#include <cerrno>
 #include <csignal>
 #include <cstdarg>
 #include <cstring>

src/zm_monitor.cpp

@@ -651,6 +651,7 @@ void Monitor::LoadCamera() {
 
   switch (type) {
     case LOCAL: {
+#if ZM_HAS_V4L
       int extras = (deinterlacing >> 24) & 0xff;
 
       camera = ZM::make_unique<LocalCamera>(this,
@@ -672,6 +673,9 @@ void Monitor::LoadCamera() {
                                             record_audio,
                                             extras
       );
+#else
+      Fatal("Not compiled with local v4l camera support");
+#endif
       break;
     }
     case REMOTE: {

src/zm_monitorstream.cpp

@@ -24,7 +24,11 @@
 #include "zm_time.h"
 #include <arpa/inet.h>
 #include <glob.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 
 const int MAX_SLEEP_USEC = 1000000; // 1 sec
 

src/zm_mpeg.h

@@ -21,6 +21,7 @@
 #define ZM_MPEG_H
 
 #include "zm_ffmpeg.h"
+#include <pthread.h>
 
 #if HAVE_LIBAVCODEC
 

src/zm_remote_camera.cpp

@@ -22,6 +22,7 @@
 #include "zm_utils.h"
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/socket.h>
 
 RemoteCamera::RemoteCamera(
   const Monitor *monitor,

src/zm_remote_camera_http.cpp

@@ -26,6 +26,7 @@
 #include "zm_utils.h"
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/socket.h>
 
 #ifdef SOLARIS
 #include <sys/filio.h> // FIONREAD and friends

src/zm_thread.cpp

@@ -21,6 +21,7 @@
 
 #include "zm_logger.h"
 #include "zm_utils.h"
+#include <cerrno>
 #include <cstring>
 #include <csignal>
 #include <sys/time.h>