From cb6ee152d2a4c5303750233a46a8274e115b90d3 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Mon, 3 Mar 2014 12:21:20 +0100 Subject: [PATCH] Define libwebsocket_write_http as a macro instead of inline This solves two problems: a) We do not need to use the keyword inline in the public header. b) We avoid a possible warning about an unused static function. --- lib/libwebsockets.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 7ab866ac..64db7a0e 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -40,7 +40,6 @@ extern "C" { #define strcasecmp stricmp #define getdtablesize() 30000 -#define inline #ifdef __MINGW64__ #else @@ -1035,13 +1034,8 @@ libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf, size_t len, enum libwebsocket_write_protocol protocol); /* helper for case where buffer may be const */ -static inline int -libwebsocket_write_http(struct libwebsocket *wsi, - const unsigned char *buf, size_t len) -{ - return libwebsocket_write(wsi, (unsigned char *)buf, len, - LWS_WRITE_HTTP); -} +#define libwebsocket_write_http(wsi, buf, len) \ + libwebsocket_write(wsi, (unsigned char *)(buf), len, LWS_WRITE_HTTP) LWS_VISIBLE LWS_EXTERN int libwebsockets_serve_http_file(struct libwebsocket_context *context,