diff options
| -rw-r--r-- | src/discord/voiceclient.cpp | 2 | ||||
| -rw-r--r-- | src/windows/mainwindow.hpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/discord/voiceclient.cpp b/src/discord/voiceclient.cpp index 3d246b1..c58d4b8 100644 --- a/src/discord/voiceclient.cpp +++ b/src/discord/voiceclient.cpp @@ -18,7 +18,7 @@ // clang-format on UDPSocket::UDPSocket() - : m_socket(INVALID_SOCKET) { + : m_socket(-1) { } UDPSocket::~UDPSocket() { diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp index 90e49b4..5cad82f 100644 --- a/src/windows/mainwindow.hpp +++ b/src/windows/mainwindow.hpp @@ -3,11 +3,11 @@ #include "components/chatwindow.hpp" #include "components/memberlist.hpp" #include "components/friendslist.hpp" -<<<<<<< HEAD #include "components/voiceinfobox.hpp" -#include <gtkmm.h> -======= ->>>>>>> master +#include <gtkmm/window.h> +#include <gtkmm/stack.h> +#include <gtkmm/menubar.h> +#include <gtkmm/checkmenuitem.h> class MainWindow : public Gtk::Window { public: |