Put back includes needed on FreeBSD. Fixes #3165
This commit is contained in:
parent
82c4a1a417
commit
6c013f0e65
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include "zm_exception.h"
|
#include "zm_exception.h"
|
||||||
#include "zm_logger.h"
|
#include "zm_logger.h"
|
||||||
|
#include <cerrno>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <sys/uio.h>
|
#include <sys/uio.h>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "zm_db.h"
|
#include "zm_db.h"
|
||||||
#include "zm_logger.h"
|
#include "zm_logger.h"
|
||||||
#include "zm_utils.h"
|
#include "zm_utils.h"
|
||||||
|
#include <cerrno>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <glob.h>
|
#include <glob.h>
|
||||||
|
|
|
@ -27,6 +27,9 @@
|
||||||
#include "zm_storage.h"
|
#include "zm_storage.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#ifdef __FreeBSD__
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
const std::string EventStream::StreamMode_Strings[4] = {
|
const std::string EventStream::StreamMode_Strings[4] = {
|
||||||
"None",
|
"None",
|
||||||
|
@ -348,7 +351,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
|
||||||
curr_frame_id = 1;
|
curr_frame_id = 1;
|
||||||
} else {
|
} else {
|
||||||
Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
|
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;
|
replay_rate = ZM_RATE_BASE;
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "zm_db.h"
|
#include "zm_db.h"
|
||||||
#include "zm_utils.h"
|
#include "zm_utils.h"
|
||||||
|
#include <cerrno>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <cstdarg>
|
#include <cstdarg>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
|
@ -651,6 +651,7 @@ void Monitor::LoadCamera() {
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case LOCAL: {
|
case LOCAL: {
|
||||||
|
#if ZM_HAS_V4L
|
||||||
int extras = (deinterlacing >> 24) & 0xff;
|
int extras = (deinterlacing >> 24) & 0xff;
|
||||||
|
|
||||||
camera = ZM::make_unique<LocalCamera>(this,
|
camera = ZM::make_unique<LocalCamera>(this,
|
||||||
|
@ -672,6 +673,9 @@ void Monitor::LoadCamera() {
|
||||||
record_audio,
|
record_audio,
|
||||||
extras
|
extras
|
||||||
);
|
);
|
||||||
|
#else
|
||||||
|
Fatal("Not compiled with local v4l camera support");
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case REMOTE: {
|
case REMOTE: {
|
||||||
|
|
|
@ -24,7 +24,11 @@
|
||||||
#include "zm_time.h"
|
#include "zm_time.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <glob.h>
|
#include <glob.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#ifdef __FreeBSD__
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
const int MAX_SLEEP_USEC = 1000000; // 1 sec
|
const int MAX_SLEEP_USEC = 1000000; // 1 sec
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#define ZM_MPEG_H
|
#define ZM_MPEG_H
|
||||||
|
|
||||||
#include "zm_ffmpeg.h"
|
#include "zm_ffmpeg.h"
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
#if HAVE_LIBAVCODEC
|
#if HAVE_LIBAVCODEC
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "zm_utils.h"
|
#include "zm_utils.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
|
||||||
RemoteCamera::RemoteCamera(
|
RemoteCamera::RemoteCamera(
|
||||||
const Monitor *monitor,
|
const Monitor *monitor,
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "zm_utils.h"
|
#include "zm_utils.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
|
||||||
#ifdef SOLARIS
|
#ifdef SOLARIS
|
||||||
#include <sys/filio.h> // FIONREAD and friends
|
#include <sys/filio.h> // FIONREAD and friends
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "zm_logger.h"
|
#include "zm_logger.h"
|
||||||
#include "zm_utils.h"
|
#include "zm_utils.h"
|
||||||
|
#include <cerrno>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
Loading…
Reference in New Issue