Merge remote-tracking branch 'origin/cmetcalf/tile_not_cancel_h'

Conflicts:
	ChangeLog
This commit is contained in:
Roland McGrath 2012-01-30 09:49:39 -08:00
commit de9298c991
2 changed files with 4 additions and 1 deletions

View File

@ -2,6 +2,8 @@
* scripts/firstversions.awk: Fix bug in version range handling.
* sysdeps/unix/sysv/linux/grantpt.c: Use <> brackets for not-cancel.h.
* sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64.
2012-01-28 Ulrich Drepper <drepper@gmail.com>

View File

@ -7,7 +7,8 @@
#include <stdlib.h>
#include <unistd.h>
#include "not-cancel.h"
#include <not-cancel.h>
#include "pty-private.h"