• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révision5792bbdca568136033b56fe4c45e22ef820c870c (tree)
l'heure2021-10-15 00:30:04
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

patch 8.2.3507: generating proto files may fail

Commit: https://github.com/vim/vim/commit/75aa92a16264e3511ba41aa306ffc1ffbbd2fe3a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 14 16:27:19 2021 +0100

patch 8.2.3507: generating proto files may fail
Problem: Generating proto files may fail.
Solution: Define attribute().

Change Summary

Modification

diff -r 0dffa40c8831 -r 5792bbdca568 src/Makefile
--- a/src/Makefile Wed Oct 13 22:30:05 2021 +0200
+++ b/src/Makefile Thu Oct 14 17:30:04 2021 +0200
@@ -533,6 +533,10 @@
533533 # CONF_OPT_CANBERRA = --enable-canberra
534534 # CONF_OPT_CANBERRA = --disable-canberra
535535
536+# libsodium - For enhanced encryption. Default is on.
537+# Uncomment the next line to not use libsodium
538+# CONF_OPT_SODIUM = --disable-libsodium
539+
536540 # FEATURES - For creating Vim with more or less features
537541 # Uncomment one of these lines when you want to include few to many features.
538542 # The default is "huge" for most systems.
@@ -615,7 +619,7 @@
615619 # Note: If you use -Wextra and get warnings in GTK code about function
616620 # parameters, you can add -Wno-cast-function-type (but not with clang)
617621 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
618-#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
622+#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
619623 # Add -Wpedantic to find // comments and other C99 constructs.
620624 # Better disable Perl and Python to avoid a lot of warnings.
621625 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
@@ -778,10 +782,6 @@
778782 # needed to avoid a problem where strings.h gets included
779783 #CFLAGS = -qsrcmsg -O2 -qmaxmem=8192 -D__STR31__
780784
781-### (W) Solaris with multi-threaded libraries (-lthread):
782-### If suspending doesn't work properly, try using this line:
783-#EXTRA_DEFS = -D_REENTRANT
784-
785785 ### (7) Solaris 2.4/2.5 with Centerline compiler
786786 #CC = clcc
787787 #X_LIBS_DIR = -L/usr/openwin/lib -R/usr/openwin/lib
@@ -1455,12 +1455,12 @@
14551455 # -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
14561456 # -D__extension__= -D__restrict="" \
14571457 # -D__gnuc_va_list=char -D__builtin_va_list=char
1458-
14591458 #
14601459 # This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
14611460 # __inline and __attribute__ are now recognized by cproto
1461+# __attribute() is not recognized and used in X11/Intrinsic.h
14621462 # -D"foo()=" is not supported by all compilers so do not use it
1463-NO_ATTR=
1463+NO_ATTR = -D"__attribute\\(x\\)="
14641464 #
14651465 # Use this for cproto 3 patchlevel 6 or below (use "cproto -V" to check):
14661466 # PROTO_FLAGS = -f4 -d -E"$(CPP)" $(NO_ATTR)
@@ -2087,7 +2087,7 @@
20872087 $(CONF_ARGS4) $(CONF_ARGS5) $(CONF_ARGS6) \
20882088 $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
20892089 $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
2090- $(CONF_OPT_SYSMOUSE) $(CONF_OPT_CANBERRA); \
2090+ $(CONF_OPT_SYSMOUSE) $(CONF_OPT_CANBERRA) $(CONF_OPT_SODIUM); \
20912091 fi
20922092
20932093 # Use "make reconfig" to rerun configure without cached values.
diff -r 0dffa40c8831 -r 5792bbdca568 src/version.c
--- a/src/version.c Wed Oct 13 22:30:05 2021 +0200
+++ b/src/version.c Thu Oct 14 17:30:04 2021 +0200
@@ -758,6 +758,8 @@
758758 static int included_patches[] =
759759 { /* Add new patch number below this line */
760760 /**/
761+ 3507,
762+/**/
761763 3506,
762764 /**/
763765 3505,
Afficher sur ancien navigateur de dépôt.