diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-14 21:37:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-14 21:37:19 +0100 |
| commit | 0251d2d8114f2faae0a5822870af2c6118bfbc15 (patch) | |
| tree | 489e95a2a7847d52c6a44be9d30d5a7f35376e61 | |
| parent | 209b8e3e3bf7a4a3d102134124120f6c7f57d560 (diff) | |
| download | vim-git-0251d2d8114f2faae0a5822870af2c6118bfbc15.tar.gz | |
patch 8.1.1008: MS-Windows: HAVE_STDINT_H only defined for non-debug versionv8.1.1008
Problem: MS-Windows: HAVE_STDINT_H only defined for non-debug version.
Solution: Move definition of HAVE_STDINT_H up. (Taro Muraoka, closes #4109)
| -rw-r--r-- | src/Make_mvc.mak | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 29d8b0eb4..1df4de856 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -626,6 +626,10 @@ CFLAGS = $(CFLAGS) /MP !endif !endif +# VC10 or later has stdint.h. +!if $(MSVC_MAJOR) >= 10 +CFLAGS = $(CFLAGS) -DHAVE_STDINT_H +!endif !ifdef NODEBUG VIM = vim @@ -649,11 +653,6 @@ OPTFLAG = $(OPTFLAG) /GL CFLAGS=$(CFLAGS) $(WP64CHECK) !endif -# VC10 or later has stdint.h. -!if $(MSVC_MAJOR) >= 10 -CFLAGS = $(CFLAGS) -DHAVE_STDINT_H -!endif - # Static code analysis generally available starting with VS2012 (VC11) or # Windows SDK 7.1 (VC10) !if ("$(ANALYZE)" == "yes") && ($(MSVC_MAJOR) >= 10) diff --git a/src/version.c b/src/version.c index fb39cf591..2f09e8028 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1008, +/**/ 1007, /**/ 1006, |