36 lines
972 B
Diff
36 lines
972 B
Diff
--- a/Outline/outline_tab.cpp.orig 2015-06-01 23:22:47.501600000 +0300
|
|
+++ b/Outline/outline_tab.cpp 2015-06-01 23:39:02.750800000 +0300
|
|
@@ -25,11 +25,14 @@
|
|
|
|
#include "outline_tab.h"
|
|
#include "outline_symbol_tree.h"
|
|
-#include "event_notifier.h"
|
|
-#include "plugin.h"
|
|
+#ifdef __WXMSW__
|
|
+#include <wx/msw/winundef.h>
|
|
+#endif
|
|
#include <wx/stc/stc.h>
|
|
#include <wx/menu.h>
|
|
#include <wx/wupdlock.h>
|
|
+#include "event_notifier.h"
|
|
+#include "plugin.h"
|
|
#include "fileextmanager.h"
|
|
|
|
const wxEventType wxEVT_SV_GOTO_DEFINITION = wxNewEventType();
|
|
--- a/CodeLite/SocketAPI/clSocketBase.h.orig 2015-07-15 18:25:00.504000000 +0300
|
|
+++ b/CodeLite/SocketAPI/clSocketBase.h 2015-07-15 18:34:16.400800000 +0300
|
|
@@ -31,11 +31,12 @@
|
|
#include <wx/string.h>
|
|
#include "codelite_exports.h"
|
|
|
|
-#ifdef _WIN32
|
|
+#ifdef __WXMSW__
|
|
#include <winsock2.h>
|
|
|
|
typedef SOCKET socket_t;
|
|
typedef int socklen_t;
|
|
+#include <wx/msw/winundef.h>
|
|
#else
|
|
typedef int socket_t;
|
|
#define INVALID_SOCKET -1
|