mirror of
https://github.com/michaelrsweet/mxml.git
synced 2024-11-24 11:25:30 +00:00
Drop long long config tests (Issue #335)
This commit is contained in:
Michael R Sweet
parent
5e35d50f75
commit
818c8a729f
@ -8,6 +8,7 @@ Changes in Mini-XML 4.0.4
|
|||||||
- Fixed an issue when reporting errors with a `NULL` options pointer
|
- Fixed an issue when reporting errors with a `NULL` options pointer
|
||||||
(Issue #329)
|
(Issue #329)
|
||||||
- Fixed some compiler warnings (Issue #333)
|
- Fixed some compiler warnings (Issue #333)
|
||||||
|
- Dropped unused `long long` config tests (Issue #335)
|
||||||
|
|
||||||
|
|
||||||
Changes in Mini-XML 4.0.3
|
Changes in Mini-XML 4.0.3
|
||||||
|
|||||||
@ -32,13 +32,6 @@
|
|||||||
# define inline
|
# define inline
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// Long long support
|
|
||||||
//
|
|
||||||
|
|
||||||
# undef HAVE_LONG_LONG_INT
|
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Have <pthread.h>?
|
// Have <pthread.h>?
|
||||||
//
|
//
|
||||||
|
|||||||
237
configure
vendored
237
configure
vendored
@ -1522,6 +1522,39 @@ fi
|
|||||||
|
|
||||||
} # ac_fn_c_try_compile
|
} # ac_fn_c_try_compile
|
||||||
|
|
||||||
|
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
||||||
|
# -------------------------------------------------------
|
||||||
|
# Tests whether HEADER exists and can be compiled using the include files in
|
||||||
|
# INCLUDES, setting the cache variable VAR accordingly.
|
||||||
|
ac_fn_c_check_header_compile ()
|
||||||
|
{
|
||||||
|
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||||||
|
printf %s "checking for $2... " >&6; }
|
||||||
|
if eval test \${$3+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
$4
|
||||||
|
#include <$2>
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_compile "$LINENO"
|
||||||
|
then :
|
||||||
|
eval "$3=yes"
|
||||||
|
else $as_nop
|
||||||
|
eval "$3=no"
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
eval ac_res=\$$3
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||||||
|
printf "%s\n" "$ac_res" >&6; }
|
||||||
|
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||||
|
|
||||||
|
} # ac_fn_c_check_header_compile
|
||||||
|
|
||||||
# ac_fn_c_try_link LINENO
|
# ac_fn_c_try_link LINENO
|
||||||
# -----------------------
|
# -----------------------
|
||||||
# Try to link conftest.$ac_ext, and return whether this succeeded.
|
# Try to link conftest.$ac_ext, and return whether this succeeded.
|
||||||
@ -1568,82 +1601,6 @@ fi
|
|||||||
as_fn_set_status $ac_retval
|
as_fn_set_status $ac_retval
|
||||||
|
|
||||||
} # ac_fn_c_try_link
|
} # ac_fn_c_try_link
|
||||||
|
|
||||||
# ac_fn_c_try_run LINENO
|
|
||||||
# ----------------------
|
|
||||||
# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
|
|
||||||
# executables *can* be run.
|
|
||||||
ac_fn_c_try_run ()
|
|
||||||
{
|
|
||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
if { { ac_try="$ac_link"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
||||||
printf "%s\n" "$ac_try_echo"; } >&5
|
|
||||||
(eval "$ac_link") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
|
|
||||||
{ { case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
||||||
printf "%s\n" "$ac_try_echo"; } >&5
|
|
||||||
(eval "$ac_try") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; }
|
|
||||||
then :
|
|
||||||
ac_retval=0
|
|
||||||
else $as_nop
|
|
||||||
printf "%s\n" "$as_me: program exited with status $ac_status" >&5
|
|
||||||
printf "%s\n" "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_retval=$ac_status
|
|
||||||
fi
|
|
||||||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
||||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
as_fn_set_status $ac_retval
|
|
||||||
|
|
||||||
} # ac_fn_c_try_run
|
|
||||||
|
|
||||||
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
||||||
# -------------------------------------------------------
|
|
||||||
# Tests whether HEADER exists and can be compiled using the include files in
|
|
||||||
# INCLUDES, setting the cache variable VAR accordingly.
|
|
||||||
ac_fn_c_check_header_compile ()
|
|
||||||
{
|
|
||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
||||||
printf %s "checking for $2... " >&6; }
|
|
||||||
if eval test \${$3+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
$4
|
|
||||||
#include <$2>
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_compile "$LINENO"
|
|
||||||
then :
|
|
||||||
eval "$3=yes"
|
|
||||||
else $as_nop
|
|
||||||
eval "$3=no"
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$3
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
printf "%s\n" "$ac_res" >&6; }
|
|
||||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
|
|
||||||
} # ac_fn_c_check_header_compile
|
|
||||||
ac_configure_args_raw=
|
ac_configure_args_raw=
|
||||||
for ac_arg
|
for ac_arg
|
||||||
do
|
do
|
||||||
@ -4057,134 +4014,6 @@ esac
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
|
|
||||||
printf %s "checking for unsigned long long int... " >&6; }
|
|
||||||
if test ${ac_cv_type_unsigned_long_long_int+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_type_unsigned_long_long_int=yes
|
|
||||||
case $ac_prog_cc_stdc in
|
|
||||||
no | c89) ;;
|
|
||||||
*)
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
/* For now, do not test the preprocessor; as of 2007 there are too many
|
|
||||||
implementations with broken preprocessors. Perhaps this can
|
|
||||||
be revisited in 2012. In the meantime, code should not expect
|
|
||||||
#if to work with literals wider than 32 bits. */
|
|
||||||
/* Test literals. */
|
|
||||||
long long int ll = 9223372036854775807ll;
|
|
||||||
long long int nll = -9223372036854775807LL;
|
|
||||||
unsigned long long int ull = 18446744073709551615ULL;
|
|
||||||
/* Test constant expressions. */
|
|
||||||
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
|
|
||||||
? 1 : -1)];
|
|
||||||
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
|
|
||||||
? 1 : -1)];
|
|
||||||
int i = 63;
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
/* Test availability of runtime routines for shift and division. */
|
|
||||||
long long int llmax = 9223372036854775807ll;
|
|
||||||
unsigned long long int ullmax = 18446744073709551615ull;
|
|
||||||
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
|
|
||||||
| (llmax / ll) | (llmax % ll)
|
|
||||||
| (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
|
|
||||||
| (ullmax / ull) | (ullmax % ull));
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_type_unsigned_long_long_int=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
|
|
||||||
printf "%s\n" "$ac_cv_type_unsigned_long_long_int" >&6; }
|
|
||||||
if test $ac_cv_type_unsigned_long_long_int = yes; then
|
|
||||||
|
|
||||||
printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
|
|
||||||
printf %s "checking for long long int... " >&6; }
|
|
||||||
if test ${ac_cv_type_long_long_int+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_type_long_long_int=yes
|
|
||||||
case $ac_prog_cc_stdc in
|
|
||||||
no | c89) ;;
|
|
||||||
*)
|
|
||||||
ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
|
|
||||||
if test $ac_cv_type_long_long_int = yes; then
|
|
||||||
if test "$cross_compiling" = yes
|
|
||||||
then :
|
|
||||||
:
|
|
||||||
else $as_nop
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <limits.h>
|
|
||||||
#ifndef LLONG_MAX
|
|
||||||
# define HALF \
|
|
||||||
(1LL << (sizeof (long long int) * CHAR_BIT - 2))
|
|
||||||
# define LLONG_MAX (HALF - 1 + HALF)
|
|
||||||
#endif
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
long long int n = 1;
|
|
||||||
int i;
|
|
||||||
for (i = 0; ; i++)
|
|
||||||
{
|
|
||||||
long long int m = n << i;
|
|
||||||
if (m >> i != n)
|
|
||||||
return 1;
|
|
||||||
if (LLONG_MAX / 2 < m)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_run "$LINENO"
|
|
||||||
then :
|
|
||||||
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_type_long_long_int=no
|
|
||||||
fi
|
|
||||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
||||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
|
|
||||||
printf "%s\n" "$ac_cv_type_long_long_int" >&6; }
|
|
||||||
if test $ac_cv_type_long_long_int = yes; then
|
|
||||||
|
|
||||||
printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-threads was given.
|
# Check whether --enable-threads was given.
|
||||||
if test ${enable_threads+y}
|
if test ${enable_threads+y}
|
||||||
then :
|
then :
|
||||||
|
|||||||
@ -104,10 +104,6 @@ dnl Inline functions...
|
|||||||
AC_C_INLINE
|
AC_C_INLINE
|
||||||
|
|
||||||
|
|
||||||
dnl Check for "long long" support...
|
|
||||||
AC_TYPE_LONG_LONG_INT
|
|
||||||
|
|
||||||
|
|
||||||
dnl Threading support
|
dnl Threading support
|
||||||
AC_ARG_ENABLE([threads], AS_HELP_STRING([--disable-threads], [disable multi-threading support, default=no]))
|
AC_ARG_ENABLE([threads], AS_HELP_STRING([--disable-threads], [disable multi-threading support, default=no]))
|
||||||
|
|
||||||
|
|||||||
@ -67,13 +67,6 @@
|
|||||||
# define inline _inline
|
# define inline _inline
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// Long long support
|
|
||||||
//
|
|
||||||
|
|
||||||
# define HAVE_LONG_LONG_INT 1
|
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Have <pthread.h>?
|
// Have <pthread.h>?
|
||||||
//
|
//
|
||||||
|
|||||||
@ -32,13 +32,6 @@
|
|||||||
# define inline
|
# define inline
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// Long long support
|
|
||||||
//
|
|
||||||
|
|
||||||
# define HAVE_LONG_LONG_INT 1
|
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Have <pthread.h>?
|
// Have <pthread.h>?
|
||||||
//
|
//
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user