diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:49:39 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:49:39 -0800 |
| commit | de9298c991eba226e15e99f39f2d66bd4d219f62 (patch) | |
| tree | 006ec355d559524a2801dda1564d4c93a50abdbf | |
| parent | 53fb8811fd7873ab67d55d72386a303e9734603a (diff) | |
| parent | 540d7568aefbc870e8f618905cfbc38f9e6fcc61 (diff) | |
| download | glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.tar.gz glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.tar.xz glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.zip | |
Merge remote-tracking branch 'origin/cmetcalf/tile_not_cancel_h'
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/grantpt.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 98ac48207c..7073727dbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c index f2fc60f83a..0a3cd472fa 100644 --- a/sysdeps/unix/sysv/linux/grantpt.c +++ b/sysdeps/unix/sysv/linux/grantpt.c @@ -7,7 +7,8 @@ #include <stdlib.h> #include <unistd.h> -#include "not-cancel.h" +#include <not-cancel.h> + #include "pty-private.h" |