thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4a.016

Browse Source 
Problem:    Features enabled in Makefile.
Solution:   Undo accidental changes.
This commit is contained in:
Bram Moolenaar
2013-07-13 15:39:33 +02:00
parent a3fe8fe632
commit a0aa9070be
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

@@ -420,9 +420,9 @@ CClink = $(CC)
# dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
# However, this may still cause problems, such as "import termios" failing. # However, this may still cause problems, such as "import termios" failing.
# Build two separate versions of Vim in that case. # Build two separate versions of Vim in that case.
CONF_OPT_PYTHON = --enable-pythoninterp #CONF_OPT_PYTHON = --enable-pythoninterp
#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp
#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
# RUBY # RUBY
@@ -499,7 +499,7 @@ CONF_OPT_PYTHON3 = --enable-python3interp
#CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=small
#CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=normal
#CONF_OPT_FEAT = --with-features=big #CONF_OPT_FEAT = --with-features=big
CONF_OPT_FEAT = --with-features=huge #CONF_OPT_FEAT = --with-features=huge
# COMPILED BY - For including a specific e-mail address for ":version". # COMPILED BY - For including a specific e-mail address for ":version".
#CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
@@ -567,7 +567,7 @@ CONF_OPT_FEAT = --with-features=huge
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
# Use this with GCC to check for mistakes, unused arguments, etc. # Use this with GCC to check for mistakes, unused arguments, etc.
CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
#CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
@@ -613,7 +613,7 @@ LINT_OPTIONS = -beprxzF
# Configuration is in the .ccmalloc or ~/.ccmalloc file. # Configuration is in the .ccmalloc or ~/.ccmalloc file.
# Doesn't work very well, since memory linked to from global variables # Doesn't work very well, since memory linked to from global variables
# (in libraries) is also marked as leaked memory. # (in libraries) is also marked as leaked memory.
LEAK_CFLAGS = -DEXITFREE #LEAK_CFLAGS = -DEXITFREE
#LEAK_LIBS = -lccmalloc #LEAK_LIBS = -lccmalloc
##################################################### #####################################################

2
src/version.c
View File

@@ -727,6 +727,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 */
/**/
16,
/**/ /**/
15, 15,
/**/ /**/