diff options
author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2015-08-23 07:41:09 +0000 |
---|---|---|
committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2015-08-23 07:41:09 +0000 |
commit | 1abfbec6c3673d23b6d476c9fbe96f97c3456d91 (patch) | |
tree | e1f1ad01d99945e1c4cc2e0881d017c38cf00ce2 | |
parent | a2c81f733c3efcf9885cb3f0a24789873a2a6a1e (diff) | |
download | lighttpd-1abfbec6c3673d23b6d476c9fbe96f97c3456d91.tar.gz |
[mod_dirlisting] remove sys/syslimits.h; base.h already includes limits.h
From: Stefan Bühler <stbuehler@web.de>
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3024 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r-- | SConstruct | 1 | ||||
-rw-r--r-- | configure.ac | 39 | ||||
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/config.h.cmake | 1 | ||||
-rw-r--r-- | src/mod_dirlisting.c | 5 |
5 files changed, 19 insertions, 28 deletions
@@ -144,7 +144,6 @@ if 1: sys/port.h winsock2.h pwd.h - sys/syslimits.h sys/resource.h sys/time.h sys/types.h sys/resource.h sys/un.h diff --git a/configure.ac b/configure.ac index 5f8d10fa..351296f0 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h \ sys/socket.h sys/time.h unistd.h sys/sendfile.h sys/uio.h \ getopt.h sys/epoll.h sys/select.h poll.h sys/poll.h sys/devpoll.h sys/filio.h \ -sys/mman.h sys/event.h port.h pwd.h sys/syslimits.h \ +sys/mman.h sys/event.h port.h pwd.h \ sys/resource.h sys/un.h syslog.h sys/prctl.h uuid/uuid.h]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -437,30 +437,29 @@ AC_ARG_WITH(webdav-props, AC_HELP_STRING([--with-webdav-props],[properties in mo AC_MSG_RESULT([$WITH_WEBDAV_PROPS]) if test "$WITH_WEBDAV_PROPS" != "no"; then - PKG_CHECK_MODULES(XML, libxml-2.0, [ + PKG_CHECK_MODULES(XML, libxml-2.0, [ AC_DEFINE([HAVE_LIBXML2], [1], [libxml2]) AC_DEFINE([HAVE_LIBXML_H], [1], [libxml.h]) - ]) - PKG_CHECK_MODULES(SQLITE, sqlite3, [ + ]) + PKG_CHECK_MODULES(SQLITE, sqlite3, [ AC_DEFINE([HAVE_SQLITE3], [1], [libsqlite3]) AC_DEFINE([HAVE_SQLITE3_H], [1], [sqlite3.h]) - ]) - - AC_MSG_CHECKING(for locks in mod_webdav) - AC_ARG_WITH(webdav-locks, AC_HELP_STRING([--with-webdav-locks],[locks in mod_webdav]), - [WITH_WEBDAV_LOCKS=$withval],[WITH_WEBDAV_LOCKS=no]) - AC_MSG_RESULT([$WITH_WEBDAV_LOCKS]) - - if test "$WITH_WEBDAV_LOCKS" != "no"; then - AC_CHECK_LIB(uuid, uuid_unparse, [ - AC_CHECK_HEADERS([uuid/uuid.h],[ - UUID_LIBS=-luuid - AC_DEFINE([HAVE_UUID], [1], [libuuid]) - AC_DEFINE([HAVE_UUID_H], [1], [uuid/uuid.h is available]) - ]) - ]) + ]) - fi + AC_MSG_CHECKING(for locks in mod_webdav) + AC_ARG_WITH(webdav-locks, AC_HELP_STRING([--with-webdav-locks],[locks in mod_webdav]), + [WITH_WEBDAV_LOCKS=$withval],[WITH_WEBDAV_LOCKS=no]) + AC_MSG_RESULT([$WITH_WEBDAV_LOCKS]) + + if test "$WITH_WEBDAV_LOCKS" != "no"; then + AC_CHECK_LIB(uuid, uuid_unparse, [ + AC_CHECK_HEADERS([uuid/uuid.h],[ + UUID_LIBS=-luuid + AC_DEFINE([HAVE_UUID], [1], [libuuid]) + AC_DEFINE([HAVE_UUID_H], [1], [uuid/uuid.h is available]) + ]) + ]) + fi fi AC_SUBST(UUID_LIBS) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13a3e19a..3d76d67c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -76,7 +76,6 @@ check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H) check_include_files(sys/sendfile.h HAVE_SYS_SENDFILE_H) check_include_files(sys/select.h HAVE_SYS_SELECT_H) -check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) check_include_files(sys/types.h HAVE_SYS_TYPES_H) check_include_files(sys/uio.h HAVE_SYS_UIO_H) check_include_files(sys/un.h HAVE_SYS_UN_H) diff --git a/src/config.h.cmake b/src/config.h.cmake index 29d4ac26..fe348178 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -19,7 +19,6 @@ #cmakedefine HAVE_SYS_RESOURCE_H #cmakedefine HAVE_SYS_SENDFILE_H #cmakedefine HAVE_SYS_SELECT_H -#cmakedefine HAVE_SYS_SYSLIMITS_H #cmakedefine HAVE_SYS_TYPES_H #cmakedefine HAVE_SYS_UIO_H #cmakedefine HAVE_SYS_UN_H diff --git a/src/mod_dirlisting.c b/src/mod_dirlisting.c index 7a98431d..48ac9b49 100644 --- a/src/mod_dirlisting.c +++ b/src/mod_dirlisting.c @@ -22,11 +22,6 @@ * this is a dirlisting for a lighttpd plugin */ - -#ifdef HAVE_SYS_SYSLIMITS_H -#include <sys/syslimits.h> -#endif - #ifdef HAVE_ATTR_ATTRIBUTES_H #include <attr/attributes.h> #endif |