From ca1c7065e9de04ceb521a0b409071275c5690341 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 10 Dec 2021 11:39:26 +0000 Subject: [PATCH] libstdc++: Fix definition of _GLIBCXX_NO_SLEEP config macro If no OS function to sleep (e.g. nanosleep, usleep, Win32 Sleep etc.) is available then configure defines the macro NO_SLEEP. But this will not get prefixed with "_GLIBCXX_" because include/Makefile.am only does that for macros beginning with "HAVE_". The configure script should define _GLIBCXX_NO_SLEEP instead (which is what the code actually checks for). libstdc++-v3/ChangeLog: * acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Add _GLIBCXX_ prefix to NO_SLEEP macro. * config.h.in: Regenerate. * configure: Regenerate. --- libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/config.h.in | 6 +++--- libstdc++-v3/configure | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 6d9a8875e318..635168d7e25a 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1562,7 +1562,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [ fi if test x"$ac_no_sleep" = x"yes"; then - AC_DEFINE(NO_SLEEP,1, [Defined if no way to sleep is available.]) + AC_DEFINE(_GLIBCXX_NO_SLEEP,1, [Defined if no way to sleep is available.]) fi AC_SUBST(GLIBCXX_LIBS) diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 420021fcb1af..10675fe25302 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -714,9 +714,6 @@ */ #undef LT_OBJDIR -/* Defined if no way to sleep is available. */ -#undef NO_SLEEP - /* Name of package */ #undef PACKAGE @@ -838,6 +835,9 @@ /* Define if C99 llrint and llround functions are missing from . */ #undef _GLIBCXX_NO_C99_ROUNDING_FUNCS +/* Defined if no way to sleep is available. */ +#undef _GLIBCXX_NO_SLEEP + /* Define if ptrdiff_t is int. */ #undef _GLIBCXX_PTRDIFF_T_IS_INT diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 61a14a2cb3b9..b1a0157d0b91 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -21006,7 +21006,7 @@ $as_echo "$ac_has_win32_sleep" >&6; } if test x"$ac_no_sleep" = x"yes"; then -$as_echo "#define NO_SLEEP 1" >>confdefs.h +$as_echo "#define _GLIBCXX_NO_SLEEP 1" >>confdefs.h fi -- 2.47.2