Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support

distros/ubuntu1204/patches/01_vendor-perl.diff

@@ -1,17 +0,0 @@
-Index: ZoneMinder/configure.ac
-===================================================================
---- ZoneMinder.orig/configure.ac	2014-12-13 15:10:27.705191682 +0100
-+++ ZoneMinder/configure.ac	2014-12-13 16:50:07.101049743 +0100
-@@ -443,10 +443,10 @@
-     PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
-     PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
-     EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
--    PERL_MM_PARMS="PREFIX=$prefix"
-+    PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
- else
-     EXTRA_PERL_LIB="# Include from system perl paths only"
--    PERL_MM_PARMS=
-+    PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
- fi
- AC_SUBST(PERL_MM_PARMS)
- AC_SUBST(EXTRA_PERL_LIB)

distros/ubuntu1204/patches/series

@@ -1 +0,0 @@
-01_vendor-perl.diff

src/zm_comms.cpp

@@ -25,7 +25,12 @@
 #include <fcntl.h>
 #include <stdarg.h>
 //#include <memory.h>
+#if defined(BSD)
+#include <stdlib.h>
+#else
 #include <alloca.h>
+#endif
+
 #include <string.h>
 //#include <unistd.h>
 #include <sys/ioctl.h>

src/zmc.cpp

@@ -19,7 +19,11 @@
 
 #include <getopt.h>
 #include <signal.h>
+#if defined(BSD)
+#include <limits.h>
+#else
 #include <values.h>
+#endif
 
 #include "zm.h"
 #include "zm_db.h"