diff options
| author | Markus Elfring <markus.elfring@web.de> | 2013-10-26 20:23:00 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2013-10-26 20:23:00 +0800 |
| commit | 7521233176ff0524fce648c8382c2cdf46a9a796 (patch) | |
| tree | 6797239f3e1368ee0142705784996fba0f1eff5d /lib | |
| parent | 299244f7fccfb66f20e84ef96d2499e025e5a49a (diff) | |
| download | libwebsockets-7521233176ff0524fce648c8382c2cdf46a9a796.tar.gz | |
make header protection unique remove __prefix
Signed-off-by: Markus Elfring <markus.elfring@web.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/client-handshake.c | 8 | ||||
| -rw-r--r-- | lib/client.c | 2 | ||||
| -rw-r--r-- | lib/getifaddrs.h | 4 | ||||
| -rw-r--r-- | lib/libwebsockets.h | 4 | ||||
| -rw-r--r-- | lib/private-libwebsockets.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/client-handshake.c b/lib/client-handshake.c index 83d8f21d..31099b8e 100644 --- a/lib/client-handshake.c +++ b/lib/client-handshake.c @@ -1,6 +1,6 @@ #include "private-libwebsockets.h" -struct libwebsocket *__libwebsocket_client_connect_2( +struct libwebsocket *libwebsocket_client_connect_2( struct libwebsocket_context *context, struct libwebsocket *wsi ) { @@ -11,7 +11,7 @@ struct libwebsocket *__libwebsocket_client_connect_2( int plen = 0; const char *ads; - lwsl_client("__libwebsocket_client_connect_2\n"); + lwsl_client("libwebsocket_client_connect_2\n"); /* * proxy? @@ -35,7 +35,7 @@ struct libwebsocket *__libwebsocket_client_connect_2( /* * prepare the actual connection (to the proxy, if any) */ - lwsl_client("__libwebsocket_client_connect_2: address %s\n", ads); + lwsl_client("libwebsocket_client_connect_2: address %s\n", ads); server_hostent = gethostbyname(ads); if (server_hostent == NULL) { @@ -309,7 +309,7 @@ libwebsocket_client_connect(struct libwebsocket_context *context, #endif lwsl_client("libwebsocket_client_connect: direct conn\n"); - return __libwebsocket_client_connect_2(context, wsi); + return libwebsocket_client_connect_2(context, wsi); bail1: free(wsi->u.hdr.ah); diff --git a/lib/client.c b/lib/client.c index 7e81df5b..fd3b2c80 100644 --- a/lib/client.c +++ b/lib/client.c @@ -52,7 +52,7 @@ int lws_client_socket_service(struct libwebsocket_context *context, * timeout protection set in client-handshake.c */ - if (__libwebsocket_client_connect_2(context, wsi) == NULL) { + if (libwebsocket_client_connect_2(context, wsi) == NULL) { /* closed */ lwsl_client("closed\n"); return -1; diff --git a/lib/getifaddrs.h b/lib/getifaddrs.h index 78719323..da69b50e 100644 --- a/lib/getifaddrs.h +++ b/lib/getifaddrs.h @@ -40,8 +40,8 @@ extern "C" { /* $KTH: ifaddrs.hin,v 1.3 2000/12/11 00:01:13 assar Exp $ */ -#ifndef __ifaddrs_h__ -#define __ifaddrs_h__ +#ifndef ifaddrs_h_7467027A95AD4B5C8DDD40FE7D973791 +#define ifaddrs_h_7467027A95AD4B5C8DDD40FE7D973791 /* * the interface is defined in terms of the fields below, and this is diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 72a3769b..d5fdaebb 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -19,8 +19,8 @@ * MA 02110-1301 USA */ -#ifndef __LIBWEBSOCKET_H__ -#define __LIBWEBSOCKET_H__ +#ifndef LIBWEBSOCKET_H_3060898B846849FF9F88F5DB59B5950C +#define LIBWEBSOCKET_H_3060898B846849FF9F88F5DB59B5950C #ifdef __cplusplus extern "C" { diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index b68b9f56..24ee858c 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -447,7 +447,7 @@ libwebsocket_service_timeout_check(struct libwebsocket_context *context, struct libwebsocket *wsi, unsigned int sec); LWS_EXTERN struct libwebsocket * -__libwebsocket_client_connect_2(struct libwebsocket_context *context, +libwebsocket_client_connect_2(struct libwebsocket_context *context, struct libwebsocket *wsi); LWS_EXTERN struct libwebsocket * |