Commit 57eeee2e authored by Yang Tse's avatar Yang Tse
Browse files

External API function linkage decoration adjustment

parent 6a79b0e8

ares/ares.h

+9 −7
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
 * Define WIN32 when build target is Win32 API

 */



#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)

#if (defined(_WIN32) || defined(__WIN32__)) && \

   !defined(WIN32) && !defined(__SYMBIAN32__)

#  define WIN32

#endif
@@ -71,17 +72,18 @@ extern "C" { 
#if !defined(CARES_STATICLIB) && \

   (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__))

   /* __declspec function decoration for Win32 and Symbian DLL's */

#  if defined(CARES_BUILDING_LIB)

#  if defined(CARES_BUILDING_LIBRARY)

#    define CARES_EXTERN  __declspec(dllexport)

#  else

#    define CARES_EXTERN  __declspec(dllimport)

#  endif

#else

   /* visibility function decoration for other cases */

#  ifdef CARES_HIDDEN_SYMBOLS

#    define CARES_EXTERN CARES_EXTERN_SYMBOL

#  else

#  if !defined(CARES_HIDDEN_SYMBOLS) || \

     defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)

#    define CARES_EXTERN

#  else

#    define CARES_EXTERN CARES_EXTERN_SYMBOL

#  endif

#endif

ares/configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ esac 
dnl libtool setup

AC_PROG_LIBTOOL



AC_MSG_CHECKING([if we need CARES_BUILDING_LIB])

AC_MSG_CHECKING([if we need CARES_BUILDING_LIBRARY])

case $host in

  *-*-mingw*)

    AC_DEFINE(CARES_BUILDING_LIB, 1, [when building c-ares library])

    AC_DEFINE(CARES_BUILDING_LIBRARY, 1, [when building c-ares library])

    AC_MSG_RESULT(yes)

    AC_MSG_CHECKING([if we need CARES_STATICLIB])

    if test "X$enable_shared" = "Xno"