From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 3 May 2018 09:52:10 +0000 (+0000)
Subject: Merge branch 'Mario/winfix' into 'master'
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=205579c894dd170deaf6290fe889fc9422eec1a7;hp=951a604c7d78876b80383c309fb356712d7262b9

Merge branch 'Mario/winfix' into 'master'

Merge branch Mario/winfix (S merge request)

See merge request xonotic/netradiant!91
---

diff --git a/libs/l_net/l_net_wins.c b/libs/l_net/l_net_wins.c
index 937e7abb..a4a33786 100644
--- a/libs/l_net/l_net_wins.c
+++ b/libs/l_net/l_net_wins.c
@@ -46,7 +46,7 @@ typedef struct tag_error_struct
 	LPSTR errstr;
 } ERROR_STRUCT;
 
-const int NET_NAMELEN = 64;
+#define NET_NAMELEN 64
 
 char my_tcpip_address[NET_NAMELEN];
 
diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 917821d2..99d63204 100644
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -37,7 +37,7 @@ void MultiMonitor_constructPreferences(PreferencesPage &page)
                                                           g_multimon_globals.m_bStartOnPrimMon);
     ui::CheckButton popup = page.appendCheckBox(
             "", "Disable system menu on popup windows",
-            mkImportExportCallback(g_Multimon_enableSysMenuPopups)
+            make_property(g_Multimon_enableSysMenuPopups)
     );
     Widget_connectToggleDependency(popup, primary_monitor);
 }
diff --git a/radiant/patch.cpp b/radiant/patch.cpp
index c48cb44a..1e41c706 100644
--- a/radiant/patch.cpp
+++ b/radiant/patch.cpp
@@ -19,6 +19,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define _USE_MATH_DEFINES
 #include "patch.h"
 
 #include <glib.h>