diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
| commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
| tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/netbeans.c | |
| parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) | |
| download | vim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz | |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
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)
Diffstat (limited to 'src/netbeans.c')
| -rw-r--r-- | src/netbeans.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 <netdb.h> # ifdef HAVE_LIBGEN_H # include <libgen.h> @@ -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. */ |