summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-08-07 13:55:10 +0200
committerBram Moolenaar <Bram@vim.org>2014-08-07 13:55:10 +0200
commit0106b4b89127b043eddf711c750364b487deb794 (patch)
treed6d79745bbd640e54017b470f19e557ebba78754
parente98cfe1cc9c1f63fc280452593b4b4cbfe2f6356 (diff)
downloadvim-0106b4b89127b043eddf711c750364b487deb794.zip
updated for version 7.4.398
Problem: Gcc error for the argument of InterlockedIncrement() and InterlockedDecrement(). (Axel Bender) Solution: Remove "unsigned" from the cRefCount_ declaration.
-rw-r--r--src/gui_dwrite.cpp2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
index cf83c0504..d4c43a37d 100644
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -377,7 +377,7 @@ public:
}
private:
- unsigned long cRefCount_;
+ long cRefCount_;
IDWriteBitmapRenderTarget* pRenderTarget_;
IDWriteRenderingParams* pRenderingParams_;
};
diff --git a/src/version.c b/src/version.c
index 878ace89d..19183fdac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 398,
+/**/
397,
/**/
396,