Merge branch 'Mario/winfix' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 3 May 2018 09:52:10 +0000 (09:52 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 3 May 2018 09:52:10 +0000 (09:52 +0000)
Merge branch Mario/winfix (S merge request)

See merge request xonotic/netradiant!91

libs/l_net/l_net_wins.c
radiant/multimon.cpp
radiant/patch.cpp

index 937e7ab..a4a3378 100644 (file)
@@ -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];
 
index 917821d..99d6320 100644 (file)
@@ -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);
 }
index c48cb44..1e41c70 100644 (file)
@@ -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>