From 2f06a79ad889d4923d10daf05bc9a4d697f5f2e5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 16 Oct 2020 20:04:26 -0400
Subject: [PATCH 1/4] fix compiler warnings

---
 src/libbcrypt/src/bcrypt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libbcrypt/src/bcrypt.c b/src/libbcrypt/src/bcrypt.c
index c32b51b0b..db16d27b3 100644
--- a/src/libbcrypt/src/bcrypt.c
+++ b/src/libbcrypt/src/bcrypt.c
@@ -22,7 +22,7 @@
 #endif
 #include <errno.h>
 
-#ifdef _WIN32 || _WIN64
+#if defined(_WIN32) || defined(_WIN64)
 // On windows we need to generate random bytes differently.
 typedef __int64 ssize_t;
 #define BCRYPT_HASHSIZE 60
@@ -117,7 +117,7 @@ int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
 	char *aux;
 
 	// Note: Windows does not have /dev/urandom sadly.
-#ifdef _WIN32 || _WIN64
+#if defined(_WIN32) || defined(_WIN64)
 	HCRYPTPROV p;
 	ULONG     i;
 

From 06c8ce57c21b940f50c6888258ad0ce87c186fe9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 7 May 2020 13:38:56 -0400
Subject: [PATCH 2/4] Make zm_terminate available to anyone who includes zm.h

---
 src/zm.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm.h b/src/zm.h
index ad0f89584..60fa67711 100644
--- a/src/zm.h
+++ b/src/zm.h
@@ -22,6 +22,7 @@
 #define ZM_H
 
 #include "zm_config.h"
+#include "zm_signal.h"
 #ifdef SOLARIS
 #undef DEFAULT_TYPE  // pthread defines this which breaks StreamType DEFAULT_TYPE
 #include <string.h>  // define strerror() and friends

From 220a89b459150e82ae4ac602edce5984bd6d4931 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 17 Oct 2020 16:17:30 -0400
Subject: [PATCH 3/4] fix eslint

---
 web/skins/classic/views/js/zone.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 9071cfb24..f476328e7 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -178,8 +178,9 @@ function applyPreset() {
 function toPixels(field, maxValue) {
   if ( field.value != '' ) {
     field.value = Math.round((field.value*maxValue)/100);
-    if ( field.value > maxValue )
+    if ( field.value > maxValue ) {
       field.value = maxValue;
+    }
   }
   field.setAttribute('step', 1);
   field.setAttribute('max', maxValue);

From 14894dfb0053f579802441c8e45cf1fa3cc09ff7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 19 Oct 2020 09:08:25 -0400
Subject: [PATCH 4/4] remove extra comma

---
 web/skins/classic/views/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index cb683adb8..b9c2d8f38 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -209,7 +209,7 @@ if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
               array_map(function($r){return $r/100;},
                 array_filter(
                   array_keys($rates),
-                  function($r){return $r >= 0 ? true : false;},
+                  function($r){return $r >= 0 ? true : false;}
                 ))) ?>], "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
           >
           <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264'),'&amp;'); ?>" type="video/mp4">