mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

unposted (cf. 36998,36999): undo 36956 / restore 34451 with expanded comment about the flip-flopping

This commit is contained in:
Barton E. Schaefer 2015-10-31 09:54:04 -07:00
parent 0e510f0c35
commit 682e779a21
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-31 Barton E. Schaefer <schaefer@zsh.org>
* unposted (cf. 36998,36999): Src/mem.c: undo 36956 / restore 34451
with expanded comment about the flip-flopping
2015-10-31 Daniel Shahaf <d.s@daniel.shahaf.name>
* 37032: Completion/Unix/Command/_git: Temporarily revert 36959.

4
Completion/Unix/Command/_qemu
View File

@ -2,7 +2,7 @@
_qemu_log_items () {
local -a opts hline
$service -d \? | while read -A hline; do
$service -d \? 2>/dev/null | while read -A hline; do
[[ $hline[1] = Log ]] && continue
opts=($opts "${hline[1]}[${hline[2,-1]}]")
done
@ -11,7 +11,7 @@ _qemu_log_items () {
local _qemu_machines
_qemu_machines=(${${${(f)"$($service -M \?)"}[2,-1]}%% *})
_qemu_machines=(${${${(f)"$($service -M \? 2>/dev/null)"}[2,-1]}%% *})
_arguments \
'-'{fda,fdb,hda,hdb,hdc,hdd,cdrom}':disk image:_files' \

7
Src/mem.c
View File

@ -79,16 +79,15 @@
#include <sys/mman.h>
#if 0
/*
* This change was designed to enable use of memory mapping on MacOS.
* This definition is designed to enable use of memory mapping on MacOS.
* However, performance tests indicate that MacOS mapped regions are
* significantly slower to allocate than memory from malloc().
* somewhat slower to allocate than memory from malloc(), so whether
* using this improves performance depends on details of zhalloc().
*/
#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
#define MAP_ANONYMOUS MAP_ANON
#endif
#endif /* 0 */
#if defined(MAP_ANONYMOUS) && defined(MAP_PRIVATE)