mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
sig_atomic_t and socklen_t fixes
This commit is contained in:
Kurt Zeilenga
parent
4d5ecb6c89
commit
535d1002ee
145
configure
vendored
145
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.16 2005/08/13 00:17:19 kurt Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.17 2005/08/13 00:47:49 kurt Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -47540,6 +47540,11 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@ -47595,73 +47600,6 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
|
||||
echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_sig_atomic_t+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if ((sig_atomic_t *) 0)
|
||||
return 0;
|
||||
if (sizeof (sig_atomic_t))
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_type_sig_atomic_t=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_type_sig_atomic_t=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
|
||||
echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
|
||||
if test $ac_cv_type_sig_atomic_t = yes; then
|
||||
:
|
||||
else
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define sig_atomic_t int
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking return type of signal handlers" >&5
|
||||
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_signal+set}" = set; then
|
||||
@ -47731,6 +47669,77 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
|
||||
echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_sig_atomic_t+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <signal.h>
|
||||
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if ((sig_atomic_t *) 0)
|
||||
return 0;
|
||||
if (sizeof (sig_atomic_t))
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_type_sig_atomic_t=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_type_sig_atomic_t=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
|
||||
echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
|
||||
if test $ac_cv_type_sig_atomic_t = yes; then
|
||||
:
|
||||
else
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define sig_atomic_t int
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
|
||||
echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_uid_t+set}" = set; then
|
||||
|
||||
21
configure.in
21
configure.in
@ -2402,19 +2402,24 @@ AC_CHECK_TYPE(size_t, unsigned)
|
||||
AC_CHECK_TYPES([long long])
|
||||
AC_CHECK_TYPES([ptrdiff_t])
|
||||
|
||||
AC_CHECK_TYPE([socklen_t], [int],,,[$ac_includes_default
|
||||
AC_CHECK_TYPE([socklen_t],,
|
||||
[AC_DEFINE_UNQUOTED([socklen_t], [int],
|
||||
[Define to `int' if <sys/socket.h> does not define.])],
|
||||
[$ac_includes_default
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
])
|
||||
|
||||
AC_CHECK_TYPE([sig_atomic_t], [int],,,[$ac_includes_default
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
#endif
|
||||
])
|
||||
])
|
||||
|
||||
AC_TYPE_SIGNAL
|
||||
|
||||
AC_CHECK_TYPE([sig_atomic_t],,
|
||||
[AC_DEFINE_UNQUOTED([sig_atomic_t], [int],
|
||||
[Define to `int' if <signal.h> does not define.])],
|
||||
[$ac_includes_default
|
||||
#include <signal.h>
|
||||
])
|
||||
|
||||
AC_TYPE_UID_T
|
||||
|
||||
AC_HEADER_TIME
|
||||
|
||||
@ -1069,7 +1069,7 @@
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
#undef pid_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
/* Define to `int' if <signal.h> does not define. */
|
||||
#undef sig_atomic_t
|
||||
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
@ -1078,7 +1078,7 @@
|
||||
/* define to snprintf routine */
|
||||
#undef snprintf
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
/* Define to `int' if <sys/socket.h> does not define. */
|
||||
#undef socklen_t
|
||||
|
||||
/* Define to `signed int' if <sys/types.h> does not define. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user