Skip to content

Commit 52a1b1b

Browse files
committed
Merge branch 'master' of https://github.com/ncsoft/Unreal.js
2 parents 8058b27 + 63663e3 commit 52a1b1b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocket.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@
2525

2626

2727
#if !PLATFORM_HTML5
28+
#ifndef LWS_INCLUDED
2829
#include "libwebsockets.h"
30+
#define LWS_INCLUDED
2931
#define LWS_EXTERN extern
3032
#include "private-libwebsockets.h"
33+
#endif
3134
#endif
3235

3336
#if PLATFORM_WINDOWS

Plugins/UnrealJS/Source/JavascriptWebSocket/WebSocketServer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
#endif
1111

1212
#if !PLATFORM_HTML5
13+
#ifndef LWS_INCLUDED
1314
#include "libwebsockets.h"
15+
#define LWS_INCLUDED
1416
#define LWS_EXTERN extern
1517
#include "private-libwebsockets.h"
18+
#endif
1619
#endif
1720

1821
#if PLATFORM_WINDOWS

0 commit comments

Comments
 (0)