aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1322: Cygwin makefile is not nicely indented

Browse Source 
Problem:    Cygwin makefile is not nicely indented.
Solution:   Addjust spaces in preprocessor directives. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2019-05-11 21:24:26 +02:00
parent a334772967
commit 6e75e0a400
2 changed files with 217 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Make_cyg_ming.mak
View File

@ -450,18 +450,14 @@ endif
ifndef RUBY_PLATFORM ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
RUBY_PLATFORM = i586-mswin32 RUBY_PLATFORM = i586-mswin32
else else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
RUBY_PLATFORM = i386-mingw32 RUBY_PLATFORM = i386-mingw32
else else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
RUBY_PLATFORM = x64-mingw32 RUBY_PLATFORM = x64-mingw32
else else
RUBY_PLATFORM = i386-mswin32 RUBY_PLATFORM = i386-mswin32
endif endif
endif endif
endif
endif
ifndef RUBY_INSTALL_NAME ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
@ -517,15 +513,13 @@ GETTEXTINCLUDE = $(GETTEXT)/include
GETTEXTLIB = $(INTLPATH) GETTEXTLIB = $(INTLPATH)
ifeq (yes, $(GETTEXT)) ifeq (yes, $(GETTEXT))
DEFINES += -DDYNAMIC_GETTEXT DEFINES += -DDYNAMIC_GETTEXT
else else ifdef DYNAMIC_GETTEXT
ifdef DYNAMIC_GETTEXT
DEFINES += -D$(DYNAMIC_GETTEXT) DEFINES += -D$(DYNAMIC_GETTEXT)
ifdef GETTEXT_DYNAMIC ifdef GETTEXT_DYNAMIC
DEFINES += -DGETTEXT_DYNAMIC -DGETTEXT_DLL=\"$(GETTEXT_DYNAMIC)\" DEFINES += -DGETTEXT_DYNAMIC -DGETTEXT_DLL=\"$(GETTEXT_DYNAMIC)\"
endif endif
endif endif
endif endif
endif
ifdef PERL ifdef PERL
CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS
@ -684,14 +678,12 @@ DEBUG_SUFFIX=d
else else
ifeq ($(OPTIMIZE), SIZE) ifeq ($(OPTIMIZE), SIZE)
CFLAGS += -Os CFLAGS += -Os
else else ifeq ($(OPTIMIZE), MAXSPEED)
ifeq ($(OPTIMIZE), MAXSPEED)
CFLAGS += -O3 CFLAGS += -O3
CFLAGS += -fomit-frame-pointer -freg-struct-return CFLAGS += -fomit-frame-pointer -freg-struct-return
else # SPEED else # SPEED
CFLAGS += -O2 CFLAGS += -O2
endif endif
endif
LFLAGS += -s LFLAGS += -s
endif endif
@ -813,15 +805,13 @@ ifeq ($(NETBEANS),yes)
ifneq ($(CHANNEL),yes) ifneq ($(CHANNEL),yes)
# Cannot use Netbeans without CHANNEL # Cannot use Netbeans without CHANNEL
NETBEANS=no NETBEANS=no
else else ifneq (yes, $(GUI))
ifneq (yes, $(GUI))
# Cannot use Netbeans without GUI. # Cannot use Netbeans without GUI.
NETBEANS=no NETBEANS=no
else else
OBJ += $(OUTDIR)/netbeans.o OBJ += $(OUTDIR)/netbeans.o
endif endif
endif endif
endif
ifeq ($(CHANNEL),yes) ifeq ($(CHANNEL),yes)
OBJ += $(OUTDIR)/channel.o OBJ += $(OUTDIR)/channel.o

2
src/version.c
View File

@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1322,
/**/ /**/
1321, 1321,
/**/ /**/