From 535d1002eecdfb0ebb872fb70957ea44ee2bf347 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 13 Aug 2005 03:04:44 +0000 Subject: [PATCH] sig_atomic_t and socklen_t fixes --- configure | 81 ++++++++++++++++++++++++-------------------- configure.in | 19 +++++++---- include/portable.hin | 4 +-- 3 files changed, 59 insertions(+), 45 deletions(-) diff --git a/configure b/configure index d2d39470b2..07950a05e8 100755 --- a/configure +++ b/configure @@ -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 +#endif + + int main () { @@ -47595,9 +47600,9 @@ _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 "$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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47606,14 +47611,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include +#include +#ifdef signal +# undef signal +#endif +#ifdef __cplusplus +extern "C" void (*signal (int, void (*)(int)))(int); +#else +void (*signal ()) (); +#endif + int main () { -if ((sig_atomic_t *) 0) - return 0; -if (sizeof (sig_atomic_t)) - return 0; +int i; ; return 0; } @@ -47640,31 +47652,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_sig_atomic_t=yes + ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_sig_atomic_t=no +ac_cv_type_signal=int 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 +echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<_ACEOF -#define sig_atomic_t int +#define RETSIGTYPE $ac_cv_type_signal _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 +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 @@ -47673,21 +47681,17 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default #include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif + int main () { -int i; +if ((sig_atomic_t *) 0) + return 0; +if (sizeof (sig_atomic_t)) + return 0; ; return 0; } @@ -47714,22 +47718,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void + ac_cv_type_sig_atomic_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_signal=int +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_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +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 RETSIGTYPE $ac_cv_type_signal +#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 diff --git a/configure.in b/configure.in index ab0f6dab64..aee988326a 100644 --- a/configure.in +++ b/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 does not define.])], + [$ac_includes_default #ifdef HAVE_SYS_SOCKET_H #include #endif -]) + ]) + +AC_TYPE_SIGNAL -AC_CHECK_TYPE([sig_atomic_t], [int],,,[$ac_includes_default -#ifdef HAVE_SIGNAL_H +AC_CHECK_TYPE([sig_atomic_t],, + [AC_DEFINE_UNQUOTED([sig_atomic_t], [int], + [Define to `int' if does not define.])], + [$ac_includes_default #include -#endif -]) + ]) -AC_TYPE_SIGNAL AC_TYPE_UID_T AC_HEADER_TIME diff --git a/include/portable.hin b/include/portable.hin index 187bb4dec1..3366962007 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -1069,7 +1069,7 @@ /* Define to `int' if does not define. */ #undef pid_t -/* Define to `int' if does not define. */ +/* Define to `int' if does not define. */ #undef sig_atomic_t /* Define to `unsigned' if does not define. */ @@ -1078,7 +1078,7 @@ /* define to snprintf routine */ #undef snprintf -/* Define to `int' if does not define. */ +/* Define to `int' if does not define. */ #undef socklen_t /* Define to `signed int' if does not define. */ -- 2.39.5