Patch 8.2.3507
Problem:    Generating proto files may fail.
Solution:   Define __attribute().
Files:      src/Makefile


*** ../vim-8.2.3506/src/Makefile        2021-08-06 20:51:33.892689095 +0100
--- src/Makefile        2021-10-14 16:24:49.759541227 +0100
***************
*** 533,538 ****
--- 533,542 ----
  # CONF_OPT_CANBERRA = --enable-canberra
  # CONF_OPT_CANBERRA = --disable-canberra
  
+ # libsodium - For enhanced encryption.  Default is on.
+ # Uncomment the next line to not use libsodium
+ # CONF_OPT_SODIUM = --disable-libsodium
+ 
  # FEATURES - For creating Vim with more or less features
  # Uncomment one of these lines when you want to include few to many features.
  # The default is "huge" for most systems.
***************
*** 615,621 ****
  # Note: If you use -Wextra and get warnings in GTK code about function
  #       parameters, you can add -Wno-cast-function-type (but not with clang)
  #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code 
-Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE 
-D_FORTIFY_SOURCE=1
! #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code 
-Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
  # Add -Wpedantic to find // comments and other C99 constructs.
  # Better disable Perl and Python to avoid a lot of warnings.
  #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic 
-Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
--- 619,625 ----
  # Note: If you use -Wextra and get warnings in GTK code about function
  #       parameters, you can add -Wno-cast-function-type (but not with clang)
  #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code 
-Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE 
-D_FORTIFY_SOURCE=1
! #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code 
-Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
  # Add -Wpedantic to find // comments and other C99 constructs.
  # Better disable Perl and Python to avoid a lot of warnings.
  #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic 
-Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
***************
*** 778,787 ****
  #       needed to avoid a problem where strings.h gets included
  #CFLAGS = -qsrcmsg -O2 -qmaxmem=8192 -D__STR31__
  
- ### (W) Solaris with multi-threaded libraries (-lthread):
- ###   If suspending doesn't work properly, try using this line:
- #EXTRA_DEFS = -D_REENTRANT
- 
  ### (7) Solaris 2.4/2.5 with Centerline compiler
  #CC = clcc
  #X_LIBS_DIR = -L/usr/openwin/lib -R/usr/openwin/lib
--- 782,787 ----
***************
*** 1455,1466 ****
  #       -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
  #       -D__extension__= -D__restrict="" \
  #       -D__gnuc_va_list=char -D__builtin_va_list=char
- 
  #
  #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
  #     __inline and __attribute__ are now recognized by cproto
  #     -D"foo()=" is not supported by all compilers so do not use it
! NO_ATTR=
  #
  # Use this for cproto 3 patchlevel 6 or below (use "cproto -V" to check):
  # PROTO_FLAGS = -f4 -d -E"$(CPP)" $(NO_ATTR)
--- 1455,1466 ----
  #       -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
  #       -D__extension__= -D__restrict="" \
  #       -D__gnuc_va_list=char -D__builtin_va_list=char
  #
  #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
  #     __inline and __attribute__ are now recognized by cproto
+ #     __attribute() is not recognized and used in X11/Intrinsic.h
  #     -D"foo()=" is not supported by all compilers so do not use it
! NO_ATTR = -D"__attribute\\(x\\)="
  #
  # Use this for cproto 3 patchlevel 6 or below (use "cproto -V" to check):
  # PROTO_FLAGS = -f4 -d -E"$(CPP)" $(NO_ATTR)
***************
*** 2087,2093 ****
                $(CONF_ARGS4) $(CONF_ARGS5) $(CONF_ARGS6) \
                $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
                $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
!               $(CONF_OPT_SYSMOUSE) $(CONF_OPT_CANBERRA); \
        fi
  
  # Use "make reconfig" to rerun configure without cached values.
--- 2087,2093 ----
                $(CONF_ARGS4) $(CONF_ARGS5) $(CONF_ARGS6) \
                $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
                $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
!               $(CONF_OPT_SYSMOUSE) $(CONF_OPT_CANBERRA) $(CONF_OPT_SODIUM); \
        fi
  
  # Use "make reconfig" to rerun configure without cached values.
*** ../vim-8.2.3506/src/version.c       2021-10-13 21:17:02.114520928 +0100
--- src/version.c       2021-10-14 16:25:57.972355607 +0100
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3507,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
151. You find yourself engaged to someone you've never actually met,
     except through e-mail.

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/20211014152814.BA505C80054%40moolenaar.net.

Raspunde prin e-mail lui