patches/strace/4.5.17/190-dirent-include.patch
author Yann Diorcet (diorcet.yann@gmail.com)
Fri Nov 16 14:59:27 2012 +0100 (2012-11-16)
changeset 3115 1c68438f44f7
permissions -rw-r--r--
complibs: introduce generic multi-complibs infrastructure

Use the same method as companion tools for providing generic and
extendable companion libs.

Signed-off-by: Yann Diorcet <diorcet.yann@gmail.com>
Message-Id: <515c5c4635d99ebe4877.1353074410@macbook-smorlat.local>
Patchwork-Id: 199613
     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