patches/strace/4.5.17/190-dirent-include.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
branch1.17
changeset 3129 b8e00eab8f81
permissions -rw-r--r--
scripts: fail on ':' in paths

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
(transplanted from 15cd5dc25929d0ccd0e1f187fe721a1ca0d48919)
     1 --- strace-orig/file.c	2008/05/20 04:56:18	1.92
     2 +++ strace/file.c	2008/08/01 01:13:10	1.93
     3 @@ -28,21 +28,22 @@
     4   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     5   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     6   *
     7 - *	$Id: file.c,v 1.92 2008/05/20 04:56:18 roland Exp $
     8 + *	$Id: file.c,v 1.93 2008/08/01 01:13:10 roland Exp $
     9   */
    10  
    11  #include "defs.h"
    12  
    13  #include <dirent.h>
    14 +
    15  #ifdef LINUX
    16 -#define dirent kernel_dirent
    17 -#define dirent64 kernel_dirent64
    18 -#include <linux/types.h>
    19 -#include <linux/dirent.h>
    20 -#undef dirent
    21 -#undef dirent64
    22 +struct kernel_dirent {
    23 +	unsigned long   d_ino;
    24 +	unsigned long   d_off;
    25 +	unsigned short  d_reclen;
    26 +	char            d_name[1];
    27 +};
    28  #else
    29 -#define kernel_dirent dirent
    30 +# define kernel_dirent dirent
    31  #endif
    32  
    33  #ifdef LINUX