ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

pull/2077/head
Isaac Connor 2018-04-06 14:42:30 -04:00
parent 7f850890cb 6efffe62b8
commit 7076ff1b1b
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -59,6 +59,7 @@ if(NOT HOST_OS)
endif(NOT HOST_OS) endif(NOT HOST_OS)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# Default CLFAGS and CXXFLAGS: # Default CLFAGS and CXXFLAGS:
set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2") set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")

2
src/zm_time.h
View File

@ -77,8 +77,6 @@ struct DeltaTimeval
#define MSEC_PER_SEC 1000 #define MSEC_PER_SEC 1000
extern struct timeval tv; extern struct timeval tv;
typedef typeof(tv.tv_sec) ast_time_t;
typedef typeof(tv.tv_usec) ast_suseconds_t;
inline int tvDiffUsec( struct timeval first, struct timeval last ) inline int tvDiffUsec( struct timeval first, struct timeval last )
{ {

2
web/includes/Event.php
View File

@ -158,7 +158,7 @@ class Event {
} # ! ZM_OPT_FAST_DELETE } # ! ZM_OPT_FAST_DELETE
} # end Event->delete } # end Event->delete
public function getStreamSrc( $args=array(), $querySep='&' ) { public function getStreamSrc( $args=array(), $querySep='&' ) {
if ( $this->{'DefaultVideo'} and $args['mode'] != 'jpeg' ) { if ( $this->{'DefaultVideo'} and $args['mode'] != 'jpeg' ) {
$streamSrc = ZM_BASE_PROTOCOL.'://'; $streamSrc = ZM_BASE_PROTOCOL.'://';
$Monitor = $this->Monitor(); $Monitor = $this->Monitor();