1
0
mirror of https://frontier.innolan.net/rainlance/c-ares.git synced 2025-10-05 16:59:44 +00:00

ares.h: stricter CARES_EXTERN linkage decorations logic

No API change involved.
This commit is contained in:
Yang Tse
2013-03-10 21:25:10 +01:00
parent 8f3f059f33
commit 127d4cb357
3 changed files with 46 additions and 52 deletions

View File

@ -114,29 +114,23 @@ libcares_la_LDFLAGS = $(AM_LDFLAGS) $(libcares_la_LDFLAGS_EXTRA)
# Add -Werror if defined
CFLAGS += @CARES_CFLAG_EXTRAS@
CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES_SYMBOL_HIDING@
# For Windows build targets, when building or using static c-ares
if USE_CPPFLAG_CARES_STATICLIB
AM_CPPFLAGS += -DCARES_STATICLIB
AM_CPPFLAGS += $(CPPFLAG_CARES_STATICLIB)
endif
libcares_la_CFLAGS_EXTRA =
libcares_la_CPPFLAGS_EXTRA = -DCARES_BUILDING_LIBRARY
if DOING_CARES_SYMBOL_HIDING
if USE_CPPFLAG_CARES_BUILDING_LIBRARY
libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING -DCARES_BUILDING_LIBRARY
else
libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING
endif
libcares_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_CARES_SYMBOL_HIDING)
else
if USE_CPPFLAG_CARES_BUILDING_LIBRARY
libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_BUILDING_LIBRARY
else
libcares_la_CPPFLAGS = $(AM_CPPFLAGS)
endif
libcares_la_CFLAGS = $(AM_CFLAGS)
libcares_la_CFLAGS_EXTRA += $(CFLAG_CARES_SYMBOL_HIDING)
libcares_la_CPPFLAGS_EXTRA += -DCARES_SYMBOL_HIDING
endif
libcares_la_CFLAGS = $(AM_CFLAGS) $(libcares_la_CFLAGS_EXTRA)
libcares_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcares_la_CPPFLAGS_EXTRA)
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc