Patch 8.1.2370 Problem: Build problems on VMS. Solution: Adjust the build file. (Zoltan Arpadffy) Files: src/Make_vms.mms, src/os_unix.c, src/os_vms.c,
*** ../vim-8.1.2369/src/Make_vms.mms 2019-11-21 17:34:46.289648736 +0100 --- src/Make_vms.mms 2019-11-30 22:33:29.639209283 +0100 *************** *** 2,10 **** # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <[email protected]> ! # Last change: 2019 Nov 21 # ! # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK # # The following could be built: --- 2,10 ---- # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <[email protected]> ! # Last change: 2019 Nov 30 # ! # This script has been tested on VMS 6.2 to 8.4 on DEC Alpha, VAX and IA64 # with MMS and MMK # # The following could be built: *************** *** 521,527 **** # Link the target $(TARGET) : $(OBJ) ! $(LD_DEF) $(LDFLAGS) /exe=$(TARGET) $+ $(ALL_LIBS) .c.obj : $(CC_DEF) $(ALL_CFLAGS) $< --- 521,529 ---- # Link the target $(TARGET) : $(OBJ) ! # make an OPT file - as the obj file list is too long for one command line ! -@ DIRECTORY *.OBJ. /BRIEF/COLUMNS=1/NOHEADING/NOTRAILING /SELECT=FILE=(NONODE,NODEVICE,NODIRECTORY,NOVERSION)/OUTPUT=ALL_OBJS_LIST.OPT ! $(LD_DEF) $(LDFLAGS) /exe=$(TARGET) ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS) .c.obj : $(CC_DEF) $(ALL_CFLAGS) $< *************** *** 536,542 **** -@ write pd "char_u *default_vim_dir = (char_u *)"$(VIMLOC)";" -@ write pd "char_u *default_vimruntime_dir = (char_u *)"$(VIMRUN)";" -@ write pd "char_u *all_cflags = (char_u *)""$(CC_DEF)$(ALL_CFLAGS_VER)"";" ! -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS) /exe=$(TARGET) *.OBJ $(ALL_LIBS)"";" -@ write pd "char_u *compiler_version = (char_u *) ""''CC_VER'"";" -@ write pd "char_u *compiled_user = (char_u *) "$(VIMUSER)";" -@ write pd "char_u *compiled_sys = (char_u *) "$(VIMHOST)";" --- 538,544 ---- -@ write pd "char_u *default_vim_dir = (char_u *)"$(VIMLOC)";" -@ write pd "char_u *default_vimruntime_dir = (char_u *)"$(VIMRUN)";" -@ write pd "char_u *all_cflags = (char_u *)""$(CC_DEF)$(ALL_CFLAGS_VER)"";" ! -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS) /exe=$(TARGET) ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS)"";" -@ write pd "char_u *compiler_version = (char_u *) ""''CC_VER'"";" -@ write pd "char_u *compiled_user = (char_u *) "$(VIMUSER)";" -@ write pd "char_u *compiled_sys = (char_u *) "$(VIMHOST)";" *************** *** 544,551 **** -@ close pd if_perl.c : if_perl.xs ! -@ $(PERL) PERL_ROOT:[LIB.ExtUtils]xsubpp -prototypes -typemap - ! PERL_ROOT:[LIB.ExtUtils]typemap if_perl.xs >> $@ make_vms.mms : -@ write sys$output "The name of the makefile MUST be <MAKE_VMS.MMS> !!!" --- 546,552 ---- -@ close pd if_perl.c : if_perl.xs ! -@ $(PERL) PERL_ROOT:[LIB.ExtUtils]xsubpp -prototypes -typemap - PERL_ROOT:[LIB.ExtUtils]typemap if_perl.xs >> $@ make_vms.mms : -@ write sys$output "The name of the makefile MUST be <MAKE_VMS.MMS> !!!" *************** *** 832,838 **** arabic.c map.obj : map.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ ! [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h \ mark.obj : mark.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h --- 833,839 ---- arabic.c map.obj : map.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ ! [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h mark.obj : mark.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h *** ../vim-8.1.2369/src/os_unix.c 2019-11-03 23:37:08.288934381 +0100 --- src/os_unix.c 2019-11-30 22:33:57.247083056 +0100 *************** *** 1671,1677 **** xterm_display_allocated = TRUE; } smsg(_("restoring display %s"), xterm_display == NULL ! ? (char *)mch_getenv("DISPLAY") : xterm_display); clear_xterm_clip(); x11_window = 0; --- 1671,1677 ---- xterm_display_allocated = TRUE; } smsg(_("restoring display %s"), xterm_display == NULL ! ? (char *)mch_getenv((char_u *)"DISPLAY") : xterm_display); clear_xterm_clip(); x11_window = 0; *************** *** 6257,6263 **** maxfd = ConnectionNumber(xterm_dpy); /* An event may have already been read but not handled. In ! * particulary, XFlush may cause this. */ xterm_update(); } # endif --- 6262,6268 ---- maxfd = ConnectionNumber(xterm_dpy); /* An event may have already been read but not handled. In ! * particularly, XFlush may cause this. */ xterm_update(); } # endif *** ../vim-8.1.2369/src/os_vms.c 2019-05-28 23:08:12.072648675 +0200 --- src/os_vms.c 2019-11-30 22:36:07.762487263 +0100 *************** *** 382,388 **** if (vms_match_num == 0) { /* first time through, setup some things */ if (NULL == vms_fmatch) { ! vms_fmatch = ALLOC_MULT(char *, EXPL_ALLOC_INC); if (!vms_fmatch) return 0; vms_match_alloced = EXPL_ALLOC_INC; --- 382,388 ---- if (vms_match_num == 0) { /* first time through, setup some things */ if (NULL == vms_fmatch) { ! vms_fmatch = ALLOC_MULT(char_u *, EXPL_ALLOC_INC); if (!vms_fmatch) return 0; vms_match_alloced = EXPL_ALLOC_INC; *************** *** 443,449 **** *num_file = 0; /* default: no files found */ files_alloced = EXPL_ALLOC_INC; files_free = EXPL_ALLOC_INC; ! *file = ALLOC_MULT(char_u **, files_alloced); if (*file == NULL) { *num_file = 0; --- 443,449 ---- *num_file = 0; /* default: no files found */ files_alloced = EXPL_ALLOC_INC; files_free = EXPL_ALLOC_INC; ! *file = ALLOC_MULT(char_u *, files_alloced); if (*file == NULL) { *num_file = 0; *** ../vim-8.1.2369/src/version.c 2019-11-30 20:58:42.993388717 +0100 --- src/version.c 2019-11-30 22:36:16.834445909 +0100 *************** *** 739,740 **** --- 739,742 ---- { /* Add new patch number below this line */ + /**/ + 2370, /**/ -- hundred-and-one symptoms of being an internet addict: 157. You fum through a magazine, you first check to see if it has a web address. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ 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/201911302138.xAULciwV015066%40masaka.moolenaar.net.
