diff options
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/m4/reentrant.m4 | 17 | ||||
| -rw-r--r-- | ares/setup.h | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/ares/m4/reentrant.m4 b/ares/m4/reentrant.m4 index 5b0e89aba..544987e8e 100644 --- a/ares/m4/reentrant.m4 +++ b/ares/m4/reentrant.m4 @@ -310,7 +310,7 @@ dnl CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R dnl ------------------------------------------------- dnl Checks if the preprocessor _REENTRANT definition dnl makes several _r functions compiler visible. -dnl Internal macro for CONFIGURE_REENTRANT. +dnl Internal macro for CARES_CONFIGURE_REENTRANT. AC_DEFUN([CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R], [ # @@ -351,23 +351,18 @@ dnl ------------------------------------------------- dnl This macro ensures that configuration tests done dnl after this will execute with preprocessor symbol dnl _REENTRANT defined. This macro also ensures that -dnl the generated config file will equally define it. -dnl Internal macro for CONFIGURE_REENTRANT. +dnl the generated config file defines NEED_REENTRANT +dnl and that in turn setup.h will define _REENTRANT. +dnl Internal macro for CARES_CONFIGURE_REENTRANT. AC_DEFUN([CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [ -AH_VERBATIM([NEED_REENTRANT], -[/* Configure process defines NEED_REENTRANT to 1 when it finds out that */ -/* _REENTRANT is required or already defined for proper configuration. */ -@%:@undef NEED_REENTRANT -@%:@if defined(NEED_REENTRANT) && !defined(_REENTRANT) -@%:@ define _REENTRANT -@%:@endif]) +AC_DEFINE(NEED_REENTRANT, 1, + [Define to 1 if _REENTRANT preprocessor symbol must be defined.]) cat >>confdefs.h <<_ACEOF [@%:@ifndef _REENTRANT @%:@ define _REENTRANT @%:@endif] _ACEOF -AC_DEFINE(NEED_REENTRANT, 1, []) ]) diff --git a/ares/setup.h b/ares/setup.h index 594042836..dd07ae184 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -40,13 +40,15 @@ #endif /* HAVE_CONFIG_H */ /* - * Solaris needs _REENTRANT set for a few function prototypes and + * HP-UX needs _REENTRANT set for a few function prototypes and * things to appear in the system header files. Unixware needs it * to build proper reentrant code. Others may also need it. */ -#ifndef _REENTRANT -# define _REENTRANT +#ifdef NEED_REENTRANT +# ifndef _REENTRANT +# define _REENTRANT +# endif #endif /* |