Fixed error with libcap handling

Fixed some type redefinitons

diff --git a/compat/types.h b/compat/types.h
index b60e5ea7afc54ea09ac71f4b19df361292c2934c..d9de081111dfd22042c4d99dbf971eed2f323017 100644 (file)
--- a/compat/types.h
+++ b/compat/types.h
@@ -116,34 +116,6 @@
 #endif
 #endif
 
-#ifndef HAVE_PID_T
-#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
-typedef long pid_t;
-#else
-typedef int pid_t;
-#endif
-#endif
-
-#ifndef HAVE_SIZE_T
-typedef unsigned int size_t;
-#endif
-
-#ifndef HAVE_SSIZE_T
-typedef int ssize_t;
-#endif
-
-#ifndef HAVE_OFF_T
-#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-typedef int64_t off_t;
-#else
-typedef long off_t;
-#endif
-#else
-typedef int off_t;
-#endif
-#endif
-
 #ifndef HAVE_MODE_T
 typedef unsigned short mode_t;
 #endif

diff --git a/configure.in b/configure.in
index 4e4fc9c205c514c546b60c8cfff24e464d2c470d..1fa387dc6f11904e706e13093f261f5ba46bfa86 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2397,9 +2397,10 @@ if test "x$with_libcap" != "xno"; then
     # and it was forced on: error
     if "x$with_libcap" = "yes" ; then
       AC_MSG_ERROR([libcap forced enabled but not available or not usable, requires libcap-2.09 or later])
+    else
+      # with_libcap is "auto"; it can't be supported. Disable.
+      with_libcap=no
     fi
-    # with_libcap is "auto"; it can't be supported. Disable.
-    with_libcap=no
   else
     # header and lib are ok, we support
     with_libcap=yes