walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Define NGHTTP2_EXTERN to __declspec(dllimport) when using nghttp2 

The private global variable nghttp2_enable_strict_preface is also
marked as NGHTTP2_EXTERN, but it is test purpose only (test with
.dll), and not part of public API.  It could be removed in the future
release.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-05-28 22:36:43 +09:00
parent a0a5f4f93e
commit 1f7e6ea3fe
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.am
View File

@ -25,7 +25,8 @@ SUBDIRS = includes
EXTRA_DIST = Makefile.msvc EXTRA_DIST = Makefile.msvc
AM_CFLAGS = $(WARNCFLAGS) AM_CFLAGS = $(WARNCFLAGS)
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes @DEFS@ AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
@DEFS@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnghttp2.pc pkgconfig_DATA = libnghttp2.pc

6
lib/includes/nghttp2/nghttp2.h
View File

@ -51,8 +51,12 @@ extern "C" {
#ifdef NGHTTP2_STATICLIB #ifdef NGHTTP2_STATICLIB
#define NGHTTP2_EXTERN #define NGHTTP2_EXTERN
#elif defined(WIN32) #elif defined(WIN32)
#ifdef BUILDING_NGHTTP2
#define NGHTTP2_EXTERN __declspec(dllexport) #define NGHTTP2_EXTERN __declspec(dllexport)
#else /* !defined(WIN32) */ #else /* !BUILDING_NGHTTP2 */
#define NGHTTP2_EXTERN __declspec(dllimport)
#endif /* !BUILDING_NGHTTP2 */
#else /* !defined(WIN32) */
#define NGHTTP2_EXTERN #define NGHTTP2_EXTERN
#endif /* !defined(WIN32) */ #endif /* !defined(WIN32) */

3
lib/nghttp2_session.c
View File

@ -307,7 +307,8 @@ static void active_outbound_item_reset(nghttp2_active_outbound_item *aob,
/* The global variable for tests where we want to disable strict /* The global variable for tests where we want to disable strict
preface handling. */ preface handling. */
int nghttp2_enable_strict_preface = 1; /* Specify NGHTTP2_EXTERN, so that we can test using Win build dll. */
NGHTTP2_EXTERN int nghttp2_enable_strict_preface = 1;
static int session_new(nghttp2_session **session_ptr, static int session_new(nghttp2_session **session_ptr,
const nghttp2_session_callbacks *callbacks, const nghttp2_session_callbacks *callbacks,