[ethtool] 02/24: Fix build with musl by using more common typedefs

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository ethtool.

commit 1e8811a457650352e224a95f9775a8bb7c360922
Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Sun Oct 26 11:44:09 2014 +0000

    Fix build with musl by using more common typedefs
    
    When using musl as the standard C library, type names such as '__int32_t' are
    not defined. Instead we must use the more commonly defined type names such as
    'int32_t', which are defined in <stdint.h>.
    
    Signed-off-by: John Spencer <maillist-linux at barfooze.de>
    Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
    Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
 internal.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/internal.h b/internal.h
index a9dfae0..262a39f 100644
--- a/internal.h
+++ b/internal.h
@@ -7,6 +7,7 @@
 #include "ethtool-config.h"
 #endif
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -17,16 +18,16 @@
 
 /* ethtool.h expects these to be defined by <linux/types.h> */
 #ifndef HAVE_BE_TYPES
-typedef __uint16_t __be16;
-typedef __uint32_t __be32;
+typedef uint16_t __be16;
+typedef uint32_t __be32;
 typedef unsigned long long __be64;
 #endif
 
 typedef unsigned long long u64;
-typedef __uint32_t u32;
-typedef __uint16_t u16;
-typedef __uint8_t u8;
-typedef __int32_t s32;
+typedef uint32_t u32;
+typedef uint16_t u16;
+typedef uint8_t u8;
+typedef int32_t s32;
 
 #include "ethtool-copy.h"
 #include "net_tstamp-copy.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/ethtool.git