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 /sysdeps/unix | |
| parent | 53fb8811fd7873ab67d55d72386a303e9734603a (diff) | |
| parent | 540d7568aefbc870e8f618905cfbc38f9e6fcc61 (diff) | |
| download | glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.zip glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.tar.gz glibc-de9298c991eba226e15e99f39f2d66bd4d219f62.tar.bz2 | |
Merge remote-tracking branch 'origin/cmetcalf/tile_not_cancel_h'
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/grantpt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c index f2fc60f..0a3cd47 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" |