diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-12 13:14:29 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-12 13:14:29 +0100 |
| commit | 4741d7bfe229b36f15379ca7eada908ae5fd0bce (patch) | |
| tree | 518b2570daddf82dc616f5a6cc598cf3bac775a0 /src | |
| parent | aea99a1222079fce1d6bcfddb132c9dbd1abe874 (diff) | |
| parent | 2fec4635425f2cf3fb56a5c69f78d273e766c7ee (diff) | |
| download | mpd-4741d7bfe229b36f15379ca7eada908ae5fd0bce.tar.gz mpd-4741d7bfe229b36f15379ca7eada908ae5fd0bce.tar.xz mpd-4741d7bfe229b36f15379ca7eada908ae5fd0bce.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to '')
| -rw-r--r-- | src/input/Init.cxx | 2 | ||||
| -rw-r--r-- | src/util/HugeAllocator.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/input/Init.cxx b/src/input/Init.cxx index 5e64dcaed..0ee87c4d8 100644 --- a/src/input/Init.cxx +++ b/src/input/Init.cxx @@ -67,7 +67,7 @@ input_stream_global_init(Error &error) case InputPlugin::InitResult::UNAVAILABLE: if (error.IsDefined()) { FormatError(error, - "Input plugin '%s' is unavailable: ", + "Input plugin '%s' is unavailable", plugin->name); error.Clear(); } diff --git a/src/util/HugeAllocator.hxx b/src/util/HugeAllocator.hxx index e85f936dc..e02e69f10 100644 --- a/src/util/HugeAllocator.hxx +++ b/src/util/HugeAllocator.hxx @@ -70,7 +70,8 @@ gcc_malloc static inline void * HugeAllocate(size_t size) { - return VirtualAlloc(nullptr, size, MEM_LARGE_PAGES, PAGE_READWRITE); + // TODO: use MEM_LARGE_PAGES + return VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE); } static inline void |