summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-03 20:12:51 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-03 20:12:51 +0200
commitdd9a4a44a9f73fea7305b4ff8ac0ccfbaea3f9aa (patch)
tree04c2d1fcba56abe187d50a64e5cb0915750c013d
parente9056b121d6e9751bc0f802c09d4697a6ce4bdd5 (diff)
updated for version 7.3.1109v7.3.1109
Problem: Building on MS-Windows doesn't see changes in if_py_both.h. Solution: Add a dependency. (Ken Takata)
-rw-r--r--src/Make_bc5.mak4
-rw-r--r--src/Make_cyg.mak4
-rw-r--r--src/Make_ming.mak4
-rw-r--r--src/Make_mvc.mak4
-rw-r--r--src/version.c2
5 files changed, 10 insertions, 8 deletions
diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak
index 3eb08692d6..8172c1f4cc 100644
--- a/src/Make_bc5.mak
+++ b/src/Make_bc5.mak
@@ -1006,10 +1006,10 @@ if_perl.c: if_perl.xs typemap
$(PERL)\bin\perl.exe $(PERL)\lib\ExtUtils\xsubpp -prototypes -typemap \
$(PERL)\lib\ExtUtils\typemap if_perl.xs > $@
-$(OBJDIR)\if_python.obj: if_python.c python.lib
+$(OBJDIR)\if_python.obj: if_python.c if_py_both.h python.lib
$(CC) -I$(PYTHON)\include $(CCARG) $(CC1) $(CC2)$@ -pc if_python.c
-$(OBJDIR)\if_python3.obj: if_python3.c python3.lib
+$(OBJDIR)\if_python3.obj: if_python3.c if_py_both.h python3.lib
$(CC) -I$(PYTHON3)\include $(CCARG) $(CC1) $(CC2)$@ -pc if_python3.c
$(OBJDIR)\if_ruby.obj: if_ruby.c ruby.lib
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index d72282aa86..68c44f0f8c 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -648,10 +648,10 @@ $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
$(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
$(CC) -c $(CFLAGS) if_ole.cpp -o $(OUTDIR)/if_ole.o
-$(OUTDIR)/if_python.o : if_python.c $(INCL)
+$(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
$(CC) -c $(CFLAGS) -I$(PYTHON)/include $< -o $@
-$(OUTDIR)/if_python3.o : if_python3.c $(INCL)
+$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
$(CC) -c $(CFLAGS) -I$(PYTHON3)/include $< -o $@
if_perl.c: if_perl.xs typemap
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 3670e7102e..45d903f5f9 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -721,10 +721,10 @@ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
gui.h
-$(OUTDIR)/if_python.o : if_python.c $(INCL)
+$(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
$(CC) -c $(CFLAGS) $(PYTHONINC) -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" $< -o $@
-$(OUTDIR)/if_python3.o : if_python3.c $(INCL)
+$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
$(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@
$(OUTDIR)/%.o : %.c $(INCL)
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 8857b96a00..a90a9bcd4e 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1113,10 +1113,10 @@ $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA
mzscheme_base.c:
$(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base
-$(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c $(INCL)
+$(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c if_py_both.h $(INCL)
$(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
-$(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c $(INCL)
+$(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL)
$(CC) $(CFLAGS) $(PYTHON3_INC) if_python3.c
$(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h
diff --git a/src/version.c b/src/version.c
index 22d46c7643..7559bfbfe0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1109,
+/**/
1108,
/**/
1107,