← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to sysdeps/unix/sysv/linux/i386/readdir64_r.c

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sysdeps/unix/sysv/linux/i386/readdir64_r.c
1
 
/* Copyright (C) 2000, 2004, 2010 Free Software Foundation, Inc.
 
1
/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
2
2
   This file is part of the GNU C Library.
3
3
 
4
4
   The GNU C Library is free software; you can redistribute it and/or
20
20
#define DIRENT_TYPE struct dirent64
21
21
#define GETDENTS_64BIT_ALIGNED 1
22
22
 
23
 
#include <sysdeps/unix/readdir_r.c>
 
23
#include <sysdeps/posix/readdir_r.c>
24
24
 
25
25
#undef __READDIR_R
26
26
#undef __GETDENTS
38
38
#define __GETDENTS __old_getdents64
39
39
#define DIRENT_TYPE struct __old_dirent64
40
40
 
41
 
#include <sysdeps/unix/readdir_r.c>
 
41
#include <sysdeps/posix/readdir_r.c>
42
42
 
43
43
compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1);
44
44
#endif