Commit 1ac12129 authored by Yang Tse's avatar Yang Tse
Browse files

setup.h handles definition of _REENTRANT based on NEED_REENTRANT 

definition which might be defined in config.h or config-*.h files
parent 3d4fb513

ares/m4/reentrant.m4

+6 −11
Original line number Diff line number Diff line
@@ -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, [])

])

ares/setup.h

+5 −3
Original line number Diff line number Diff line
@@ -40,14 +40,16 @@ 
#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.

 */



#ifdef NEED_REENTRANT

#  ifndef _REENTRANT

#    define _REENTRANT

#  endif

#endif



/*

 * Include header files for windows builds before redefining anything.

lib/setup.h

+5 −3
Original line number Diff line number Diff line
@@ -73,14 +73,16 @@ 
#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.

 */



#ifdef NEED_REENTRANT

#  ifndef _REENTRANT

#    define _REENTRANT

#  endif

#endif



/*

 * Disable other protocols when http is the only one desired.

m4/reentrant.m4

+6 −11
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ dnl CURL_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 CURL_CONFIGURE_REENTRANT.



AC_DEFUN([CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R], [

  #
@@ -373,23 +373,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 CURL_CONFIGURE_REENTRANT.



AC_DEFUN([CURL_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, [])

])

src/setup.h

+10 −5
Original line number Diff line number Diff line
@@ -72,11 +72,16 @@ 


#endif /* HAVE_CONFIG_H */



#if defined(CURLDEBUG) && defined(CURLTOOLDEBUG)

/* This is an ugly hack for CURLDEBUG conditions only. We need to include

   the file here, since it might set the _FILE_OFFSET_BITS define, which must

   be set BEFORE all normal system headers. */

#include "../lib/setup.h"

/*

 * 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.

 */



#ifdef NEED_REENTRANT

#  ifndef _REENTRANT

#    define _REENTRANT

#  endif

#endif



/*