qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker. 

Properly handle partial reads.
	    Ulrich Drepper  <drepper@redhat.com>
	Reported by Peter Festner <peter.festner@ewetel.net>.
	    Tomas Janousek  <tjanouse@redhat.com>
	    Ulrich Drepper  <drepper@redhat.com>
This commit is contained in:
Andreas Schwab 2009-01-21 23:14:12 +00:00
parent 965cb60a21
commit f00d47a36f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -80,7 +80,6 @@
* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Check and * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Check and
adjust the buffer alignment. adjust the buffer alignment.
>>>>>>> 1.11443
2009-01-07 Samuel Thibault <samuel.thibault@ens-lyon.org> 2009-01-07 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]: * sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]: