From 4f97475d326c2773a78561fb874e4f23c25cbcd9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 17 Feb 2019 17:44:42 +0100 Subject: patch 8.1.0941: macros for MS-Windows are inconsistent Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and others. Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the GUI build. (Hirohito Higashi, closes #3932) --- src/netbeans.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/netbeans.c') diff --git a/src/netbeans.c b/src/netbeans.c index ecc7625e9..2682d1c0b 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -27,7 +27,7 @@ #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) -#ifndef WIN32 +#ifndef MSWIN # include # ifdef HAVE_LIBGEN_H # include @@ -2347,7 +2347,7 @@ ex_nbstart( { #ifdef FEAT_GUI # if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) \ - && !defined(FEAT_GUI_W32) + && !defined(FEAT_GUI_MSWIN) if (gui.in_use) { emsg(_("E838: netbeans is not supported with this GUI")); @@ -2567,7 +2567,7 @@ set_ref_in_nb_channel(int copyID) } #endif -#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO) +#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * Tell netbeans that the window was moved or resized. */ -- cgit v1.2.1