summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-27 21:49:14 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-27 21:49:14 +0100
commit90d0cf69aab7c1d6f5212d47ca1a5fe1a213bbc8 (patch)
treebed7ccdd645cec9167b186079361f7f17321daa4 /src
parent3a731ee0c2dd34792c1b21fc4c699a84129f1b86 (diff)
patch 8.1.1059: MS-Windows: PlatformId() is called unnecessarilyv8.1.1059
Problem: MS-Windows: PlatformId() is called unnecessarily. Solution: Remove calls to PlatformId(). (Ken Takata, closes #4170)
Diffstat (limited to 'src')
-rw-r--r--src/os_win32.c6
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 7930957ad3..81cf737827 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -6796,7 +6796,6 @@ mch_total_mem(int special UNUSED)
{
MEMORYSTATUSEX ms;
- PlatformId();
/* Need to use GlobalMemoryStatusEx() when there is more memory than
* what fits in 32 bits. But it's not always available. */
ms.dwLength = sizeof(MEMORYSTATUSEX);
@@ -6982,8 +6981,6 @@ mch_rename(
char *
default_shell(void)
{
- PlatformId();
-
return "cmd.exe";
}
@@ -7327,7 +7324,6 @@ copy_infostreams(char_u *from, char_u *to)
mch_copy_file_attribute(char_u *from, char_u *to)
{
/* File streams only work on Windows NT and later. */
- PlatformId();
copy_infostreams(from, to);
return 0;
}
@@ -7358,8 +7354,6 @@ myresetstkoflw(void)
DWORD nPageSize;
DWORD dummy;
- PlatformId();
-
/* We need to know the system page size. */
GetSystemInfo(&si);
nPageSize = si.dwPageSize;
diff --git a/src/version.c b/src/version.c
index 541a02f830..c7fcb590fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -776,6 +776,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1059,
+/**/
1058,
/**/
1057,