From: maximilian attems <max@stro.at>
Date: Sun, 7 Sep 2008 19:57:24 +0000 (+0200)
Subject: partx: don't redeclare daddr_t
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3342f88dec9af581385a52a9add92c40c0939b6d;p=util-linux

partx: don't redeclare daddr_t

klibc porting fix, use proper include, nuke redefinition.
solaris.c:8: error: redefinition of typedef ‘daddr_t’
/usr/lib/klibc/include/sys/types.h:29: error: previous declaration of ‘daddr_t’ was here

Signed-off-by: maximilian attems <max@stro.at>
---

diff --git a/partx/solaris.c b/partx/solaris.c
index 86a3e364..24075aed 100644
--- a/partx/solaris.c
+++ b/partx/solaris.c
@@ -1,12 +1,11 @@
 #include <stdio.h>
 #include <time.h>		/* time_t */
+#include <sys/types.h>
 #include "partx.h"
 
 #define SOLARIS_X86_NUMSLICE	8
 #define SOLARIS_X86_VTOC_SANE	(0x600DDEEEUL)
 
-typedef int daddr_t;		/* or long - check */
-
 struct solaris_x86_slice {
 	unsigned short	s_tag;		/* ID tag of partition */
 	unsigned short	s_flag;		/* permision flags */