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.2370: build problems on VMS

Browse Source 
Problem:    Build problems on VMS.
Solution:   Adjust the build file. (Zoltan Arpadffy)
This commit is contained in:
Bram Moolenaar 2019-11-30 22:38:16 +01:00
parent a2c2ae473a
commit 0c5c3faef2
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Make_vms.mms
View File

@ -2,9 +2,9 @@
# Makefile for Vim on OpenVMS
#
# Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com>
# Last change: 2019 Nov 21
# Last change: 2019 Nov 30
#
# This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
# 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,7 +521,9 @@ clean :
# Link the target
$(TARGET) : $(OBJ)
$(LD_DEF) $(LDFLAGS) /exe=$(TARGET) $+ $(ALL_LIBS)
# 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,7 +538,7 @@ pathdef.c : check_ccver $(CONFIG_H)
-@ 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 *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,8 +546,7 @@ pathdef.c : check_ccver $(CONFIG_H)
-@ close pd
if_perl.c : if_perl.xs
-@ $(PERL) PERL_ROOT:[LIB.ExtUtils]xsubpp -prototypes -typemap -
PERL_ROOT:[LIB.ExtUtils]typemap 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,7 +833,7 @@ main.obj : main.c vim.h [.auto]config.h feature.h os_unix.h \
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 \
[.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

4
src/os_unix.c
View File

@ -1671,7 +1671,7 @@ ex_xrestore(exarg_T *eap)
xterm_display_allocated = TRUE;
}
smsg(_("restoring display %s"), xterm_display == NULL
? (char *)mch_getenv("DISPLAY") : xterm_display);
? (char *)mch_getenv((char_u *)"DISPLAY") : xterm_display);
clear_xterm_clip();
x11_window = 0;
@ -6257,7 +6257,7 @@ select_eintr:
maxfd = ConnectionNumber(xterm_dpy);
/* An event may have already been read but not handled. In
* particulary, XFlush may cause this. */
* particularly, XFlush may cause this. */
xterm_update();
}
# endif

4
src/os_vms.c
View File

@ -382,7 +382,7 @@ vms_wproc(char *name, int val)
if (vms_match_num == 0) {
/* first time through, setup some things */
if (NULL == vms_fmatch) {
vms_fmatch = ALLOC_MULT(char *, EXPL_ALLOC_INC);
vms_fmatch = ALLOC_MULT(char_u *, EXPL_ALLOC_INC);
if (!vms_fmatch)
return 0;
vms_match_alloced = EXPL_ALLOC_INC;
@ -443,7 +443,7 @@ mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, i
*num_file = 0; /* default: no files found */
files_alloced = EXPL_ALLOC_INC;
files_free = EXPL_ALLOC_INC;
*file = ALLOC_MULT(char_u **, files_alloced);
*file = ALLOC_MULT(char_u *, files_alloced);
if (*file == NULL)
{
*num_file = 0;

2
src/version.c
View File

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