Skip to content

Commit 0472b6d

Browse files
brammoolbrammool
committed
patch 8.1.0949: MS-windows defines GUI macros different than other systems
Problem: MS-windows defines GUI macros different than other systems. Solution: Swap FEAT_GUI and FEAT_GUI_MSWIN. (Hirohito Higashi, closes #3996)
1 parent d53931a commit 0472b6d

8 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎src/Make_bc5.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ DEFINES = $(DEFINES) -DFEAT_CSCOPE
405405
!endif
406406

407407
!if ("$(GUI)"=="yes")
408-
DEFINES = $(DEFINES) -DFEAT_GUI -DFEAT_CLIPBOARD
408+
DEFINES = $(DEFINES) -DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
409409
!if ("$(DEBUG)"=="yes")
410410
TARGET = gvimd.exe
411411
!else

‎src/Make_cyg_ming.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ endif # RUBY
491491

492492
# See feature.h for a list of options.
493493
# Any other defines can be included here.
494-
DEF_GUI=-DFEAT_GUI -DFEAT_CLIPBOARD
494+
DEF_GUI=-DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
495495
DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
496496
-DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H
497497
ifeq ($(ARCH),x86-64)

‎src/Make_ivc.mak‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ LINK32_FLAGS= oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg3
9292
# ADD LINK32 oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib uuid.lib /nologo /machine:I386 /nodefaultlib
9393
# SUBTRACT LINK32 /incremental:yes
9494

95-
RSC_PROJ= /l 0x409 /d "FEAT_GUI"
96-
# ADD RSC /l 0x409 /d "FEAT_GUI"
95+
RSC_PROJ= /l 0x409 /d "FEAT_GUI_MSWIN"
96+
# ADD RSC /l 0x409 /d "FEAT_GUI_MSWIN"
9797

9898
!IF "$(CFG)" == "Vim - Win32 Release gvim OLE"
9999

@@ -105,8 +105,8 @@ INTDIR=.\oleRel
105105
VIM=gvim
106106
EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj"
107107

108-
CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/
109-
# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/
108+
CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/
109+
# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/
110110

111111
RSC_PROJ=$(RSC_PROJ) /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res
112112
# ADD RSC /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res
@@ -124,8 +124,8 @@ INTDIR=.\oleDbg
124124
VIM=gvimd
125125
EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj"
126126

127-
CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/
128-
# ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/
127+
CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/
128+
# ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/
129129

130130
RSC_PROJ=$(RSC_PROJ) /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res
131131
# ADD RSC /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res
@@ -144,8 +144,8 @@ INTDIR=.\gRel
144144
VIM=gvim
145145
EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj"
146146

147-
CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /Fd.\gRel/ /Fo.\gRel/
148-
# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /Fd.\gRel/ /Fo.\gRel/
147+
CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gRel/ /Fo.\gRel/
148+
# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gRel/ /Fo.\gRel/
149149

150150
RSC_PROJ=$(RSC_PROJ) /d "NDEBUG" /fo.\gRel\vim.res
151151
# ADD RSC /d "NDEBUG" /fo.\gRel\vim.res
@@ -163,8 +163,8 @@ INTDIR=.\gDbg
163163
VIM=gvimd
164164
EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj"
165165

166-
CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /Fd.\gDbg/ /Fo.\gDbg/
167-
# ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /Fd.\gDbg/ /Fo.\gDbg/
166+
CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gDbg/ /Fo.\gDbg/
167+
# ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gDbg/ /Fo.\gDbg/
168168

169169
RSC_PROJ=$(RSC_PROJ) /d "_DEBUG" /fo.\gDbg\vim.res
170170
# ADD RSC /d "_DEBUG" /fo.\gDbg\vim.res
@@ -508,7 +508,7 @@ SOURCE=.\if_ole.cpp
508508
# Begin Custom Build
509509

510510
"$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h"
511-
cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp
511+
cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp
512512
@rem This is the default rule with /I "$(IntDir)" added
513513

514514
# End Custom Build
@@ -519,7 +519,7 @@ SOURCE=.\if_ole.cpp
519519
# Begin Custom Build
520520

521521
"$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h"
522-
cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ /I ".\oleDbg" .\if_ole.cpp
522+
cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ /I ".\oleDbg" .\if_ole.cpp
523523
@rem This is the default rule with /I "$(IntDir)" added
524524

525525
# End Custom Build

‎src/Make_mvc.mak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,8 @@ OBJ = $(OBJ) $(OUTDIR)\dimm_i.obj $(OUTDIR)\glbl_ime.obj
791791

792792
!if "$(GUI)" == "yes"
793793
SUBSYSTEM = windows
794-
CFLAGS = $(CFLAGS) -DFEAT_GUI
795-
RCFLAGS = $(RCFLAGS) -DFEAT_GUI
794+
CFLAGS = $(CFLAGS) -DFEAT_GUI_MSWIN
795+
RCFLAGS = $(RCFLAGS) -DFEAT_GUI_MSWIN
796796
VIM = g$(VIM)
797797
GUI_INCL = \
798798
gui.h

‎src/if_ole.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Do ":help credits" in Vim to see a list of people who contributed.
77
*/
88

9-
#if defined(FEAT_OLE) && defined(WIN32) && defined(FEAT_GUI)
9+
#if defined(FEAT_OLE) && defined(FEAT_GUI_MSWIN)
1010
/*
1111
* OLE server implementation.
1212
*

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ static char *(features[]) =
779779

780780
static int included_patches[] =
781781
{ /* Add new patch number below this line */
782+
/**/
783+
949,
782784
/**/
783785
948,
784786
/**/

‎src/vim.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
// Note: If you want to check for 64-bit use the _WIN64 macro.
1616
#if defined(WIN32) || defined(_WIN32)
1717
# define MSWIN
18-
# ifdef FEAT_GUI
19-
# define FEAT_GUI_MSWIN
20-
# endif
2118
#endif
2219

2320
// use fastcall for Borland, when compiling for MS-Windows

‎src/vim.rc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//
2424
IDR_VIM ICON "vim.ico"
2525

26-
#ifdef FEAT_GUI
26+
#ifdef FEAT_GUI_MSWIN
2727
IDR_VIM_ERROR ICON "vim_error.ico"
2828
IDR_VIM_ALERT ICON "vim_alert.ico"
2929
IDR_VIM_INFO ICON "vim_info.ico"
@@ -46,7 +46,7 @@ IDR_TOOLBAR1 BITMAP DISCARDABLE "tools.bmp"
4646
#endif
4747

4848
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf"
49-
#endif // FEAT_GUI
49+
#endif // FEAT_GUI_MSWIN
5050

5151
//
5252
// Type Library

0 commit comments

Comments
 (0)