Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
4741d7bf
Commit
4741d7bf
authored
Dec 12, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.19.x'
parents
aea99a12
2fec4635
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
NEWS
NEWS
+1
-0
Init.cxx
src/input/Init.cxx
+1
-1
HugeAllocator.hxx
src/util/HugeAllocator.hxx
+2
-1
No files found.
NEWS
View file @
4741d7bf
...
...
@@ -18,6 +18,7 @@ ver 0.20 (not yet released)
ver 0.19.7 (not yet released)
* playlist
- don't skip non-existent songs in "listplaylist"
* fix memory allocator bug on Windows
ver 0.19.6 (2014/12/08)
* decoder
...
...
src/input/Init.cxx
View file @
4741d7bf
...
...
@@ -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
();
}
...
...
src/util/HugeAllocator.hxx
View file @
4741d7bf
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment