From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754330AbbJOHEK (ORCPT ); Thu, 15 Oct 2015 03:04:10 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:40286 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613AbbJOHEI (ORCPT ); Thu, 15 Oct 2015 03:04:08 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: mikko.rapeli@iki.fi Subject: [PATCH v4 74/79] include/linux/xz.h: use linux/types.h types instead of stdint.h Date: Thu, 15 Oct 2015 07:56:52 +0200 Message-Id: <1444888618-4506-75-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> References: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> X-SA-Exim-Connect-IP: 46.5.253.112 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kernel headers should use linux/types.h types. Signed-off-by: Mikko Rapeli --- include/linux/xz.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/linux/xz.h b/include/linux/xz.h index 64cffa6..7686511 100644 --- a/include/linux/xz.h +++ b/include/linux/xz.h @@ -11,12 +11,11 @@ #ifndef XZ_H #define XZ_H +# include #ifdef __KERNEL__ # include -# include #else # include -# include #endif /* In Linux, this is used to make extern functions static when needed. */ @@ -134,11 +133,11 @@ enum xz_ret { * the variables in_pos and out_pos are modified by the XZ code. */ struct xz_buf { - const uint8_t *in; + const __u8 *in; size_t in_pos; size_t in_size; - uint8_t *out; + __u8 *out; size_t out_pos; size_t out_size; }; @@ -191,7 +190,7 @@ struct xz_dec; * ready to be used with xz_dec_run(). If memory allocation fails, * xz_dec_init() returns NULL. */ -XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max); +XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, __u32 dict_max); /** * xz_dec_run() - Run the XZ decoder @@ -259,6 +258,6 @@ XZ_EXTERN void xz_crc32_init(void); * calculation, the third argument must be zero. To continue the calculation, * the previously returned value is passed as the third argument. */ -XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc); +XZ_EXTERN __u32 xz_crc32(const __u8 *buf, size_t size, __u32 crc); #endif #endif -- 2.5.0