diff options
| author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
| commit | 2feb372c585eb77141adbff24d4958e5a5e6678a (patch) | |
| tree | 79416b255a6e61e6fdbc913da3be86d87a8a25ff /posix/tst-gnuglob.c | |
| parent | c69c361ca6bf95f8c665884ee863168a321d472a (diff) | |
| parent | 916ef0f69613613e11123657bff127bd26104630 (diff) | |
| download | glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.tar.gz glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.tar.xz glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.zip | |
Merge release/2.20/master into ibm/2.20/master ibm/2.20/master
Conflicts: NEWS
Diffstat (limited to 'posix/tst-gnuglob.c')
| -rw-r--r-- | posix/tst-gnuglob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/posix/tst-gnuglob.c b/posix/tst-gnuglob.c index 1c72357de3..48c7527be8 100644 --- a/posix/tst-gnuglob.c +++ b/posix/tst-gnuglob.c @@ -211,7 +211,7 @@ my_readdir (void *gdir) return NULL; } - dir->d.d_ino = dir->idx; + dir->d.d_ino = 1; /* glob should not skip this entry. */ #ifdef _DIRENT_HAVE_D_TYPE dir->d.d_type = filesystem[dir->idx].type; |