mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-04 17:24:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Do the <inttypes.h> checks only if the <stdint.h> checks are successful.

Browse Source 
2006-01-30  Paolo Carlini  <pcarlini@suse.de>

	* acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Do the <inttypes.h>
	checks only if the <stdint.h> checks are successful.
	* configure: Regenerate.

From-SVN: r110399
This commit is contained in:
Paolo Carlini 2006-01-30 15:32:09 +00:00 committed by Paolo Carlini
parent a6ab9fc087
commit 03bf3bc105
3 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-30 Paolo Carlini <pcarlini@suse.de>
* acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Do the <inttypes.h>
checks only if the <stdint.h> checks are successful.
* configure: Regenerate.
2006-01-30 Paolo Carlini <pcarlini@suse.de>
* include/tr1/cinttypes: New.

36
libstdc++-v3/acinclude.m4
View File

@ -1181,27 +1181,29 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
<tr1/cstdint> in namespace std::tr1.])
fi
# Check for the existence of <inttypes.h> functions.
AC_MSG_CHECKING([for ISO C99 support to TR1 in <inttypes.h>])
AC_CACHE_VAL(ac_c99_inttypes_tr1, [
AC_TRY_COMPILE([#include <inttypes.h>],
[intmax_t i, numer, denom, base;
const char* s;
char** endptr;
intmax_t ret;
uintmax_t uret;
imaxdiv_t dret;
ret = imaxabs(i);
dret = imaxdiv(numer, denom);
ret = strtoimax(s, endptr, base);
uret = strtoumax(s, endptr, base);
],[ac_c99_inttypes_tr1=yes], [ac_c99_inttypes_tr1=no])
])
# Check for the existence of <inttypes.h> functions (NB: doesn't make
# sense if the previous check fails, per C99, 7.8/1).
ac_c99_inttypes_tr1=no;
if test x"$ac_c99_stdint_tr1" = x"yes"; then
AC_MSG_CHECKING([for ISO C99 support to TR1 in <inttypes.h>])
AC_TRY_COMPILE([#include <inttypes.h>],
[intmax_t i, numer, denom, base;
const char* s;
char** endptr;
intmax_t ret;
uintmax_t uret;
imaxdiv_t dret;
ret = imaxabs(i);
dret = imaxdiv(numer, denom);
ret = strtoimax(s, endptr, base);
uret = strtoumax(s, endptr, base);
],[ac_c99_inttypes_tr1=yes], [ac_c99_inttypes_tr1=no])
fi
AC_MSG_RESULT($ac_c99_inttypes_tr1)
if test x"$ac_c99_inttypes_tr1" = x"yes"; then
AC_DEFINE(_GLIBCXX_USE_C99_INTTYPES_TR1, 1,
[Define if C99 functions in <inttypes.h> should be imported in
<tr1/cinttypes> in namespace std::tr1.])
<tr1/cinttypes> in namespace std::tr1.])
fi
AC_LANG_RESTORE

35
libstdc++-v3/configure vendored
View File

@ -30610,14 +30610,13 @@ _ACEOF
fi
# Check for the existence of <inttypes.h> functions.
echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <inttypes.h>" >&5
# Check for the existence of <inttypes.h> functions (NB: doesn't make
# sense if the previous check fails, per C99, 7.8/1).
ac_c99_inttypes_tr1=no;
if test x"$ac_c99_stdint_tr1" = x"yes"; then
echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <inttypes.h>" >&5
echo $ECHO_N "checking for ISO C99 support to TR1 in <inttypes.h>... $ECHO_C" >&6
if test "${ac_c99_inttypes_tr1+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@ -30628,15 +30627,15 @@ int
main ()
{
intmax_t i, numer, denom, base;
const char* s;
char** endptr;
intmax_t ret;
uintmax_t uret;
imaxdiv_t dret;
ret = imaxabs(i);
dret = imaxdiv(numer, denom);
ret = strtoimax(s, endptr, base);
uret = strtoumax(s, endptr, base);
const char* s;
char** endptr;
intmax_t ret;
uintmax_t uret;
imaxdiv_t dret;
ret = imaxabs(i);
dret = imaxdiv(numer, denom);
ret = strtoimax(s, endptr, base);
uret = strtoumax(s, endptr, base);
;
return 0;
@ -30672,9 +30671,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_c99_inttypes_tr1=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_c99_inttypes_tr1" >&5
echo "${ECHO_T}$ac_c99_inttypes_tr1" >&6
if test x"$ac_c99_inttypes_tr1" = x"yes"; then