ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper checking for sys/syscall.h

This commit is contained in:
mastertheknife 2013-09-25 07:11:59 +03:00
parent 617cbc0edb
commit e8d20faec8
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -302,7 +302,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h]) AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h]) AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
AC_CHECK_HEADERS(execinfo.h,,,) AC_CHECK_HEADERS(execinfo.h,,,)
AC_CHECK_HEADERS(syscall.h,,,) AC_CHECK_HEADERS(sys/syscall.h,,,)
AC_CHECK_HEADERS(pthread.h,,,) AC_CHECK_HEADERS(pthread.h,,,)
AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),) AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),) AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)

3
src/zm_logger.cpp
View File

@ -28,9 +28,6 @@
#include <string.h> #include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <syslog.h> #include <syslog.h>
#ifdef HAVE_SYSCALL_H
#include <syscall.h>
#endif // HAVE_SYSCALL_H
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>

3
src/zm_logger.h
View File

@ -23,6 +23,9 @@
#include <unistd.h> #include <unistd.h>
#include <string> #include <string>
#include <map> #include <map>
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif // HAVE_SYS_SYSCALL_H
#include <mysql/mysql.h> #include <mysql/mysql.h>
class Logger class Logger

4
src/zm_thread.h
View File

@ -23,7 +23,9 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
#include <syscall.h> #ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif // HAVE_SYS_SYSCALL_H
#include "zm_exception.h" #include "zm_exception.h"
#include "zm_utils.h" #include "zm_utils.h"

4
src/zm_timer.h
View File

@ -20,7 +20,9 @@
#ifndef ZM_TIMER_H #ifndef ZM_TIMER_H
#define ZM_TIMER_H #define ZM_TIMER_H
#include <syscall.h> #ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif // HAVE_SYS_SYSCALL_H
#include "zm_thread.h" #include "zm_thread.h"
#include "zm_exception.h" #include "zm_exception.h"