win32 move gettimeofday include inside extern c
authorAndy Green <andy@warmcat.com>
Sat, 14 May 2011 13:07:56 +0000 (15:07 +0200)
committerAndy Green <andy@warmcat.com>
Sat, 14 May 2011 13:07:56 +0000 (15:07 +0200)
Reported-by: Michel Archambault <marchamb@matrox.com>
Signed-off-by: Andy Green <andy@warmcat.com>
lib/libwebsockets.h

index 77bfa3d..95a7ae0 100644 (file)
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include "websock-w32.h"
-#include "gettimeofday.h"
 
 #ifdef __cplusplus
 extern "C" {
+#include "gettimeofday.h"
 #endif
 #else
 #include <poll.h>
@@ -654,6 +654,12 @@ lws_send_pipe_choked(struct libwebsocket *wsi);
 extern unsigned char *
 libwebsockets_SHA1(const unsigned char *d, size_t n, unsigned char *md);
 
+extern int
+lws_b64_encode_string(const char *in, int in_len, char *out, int out_size);
+
+extern int
+lws_b64_decode_string(const char *in, char *out, int out_size);
+
 extern struct libwebsocket_extension libwebsocket_internal_extensions[];
 
 #ifdef WIN32