From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754806AbbJOGZO (ORCPT ); Thu, 15 Oct 2015 02:25:14 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:43843 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753859AbbJOGZJ (ORCPT ); Thu, 15 Oct 2015 02:25:09 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: mikko.rapeli@iki.fi, Chris Mason , Takeuchi Satoru , David Sterba , Eryu Guan , linux-api@vger.kernel.org Subject: [PATCH v4 62/79] include/uapi/linux/btrfs.h: define NULL Date: Thu, 15 Oct 2015 07:56:40 +0200 Message-Id: <1444888618-4506-63-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Copied the NULL definition from include/linux/stddef.h which does not have it in userspace. Fixes userspace compilation error: error: ‘NULL’ undeclared (first use in this function) return NULL; Signed-off-by: Mikko Rapeli --- include/uapi/linux/btrfs.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index b6dec05..a8ae69b 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -20,6 +20,12 @@ #define _UAPI_LINUX_BTRFS_H #include #include +#include + +/* for userspace where linux/stddef.h doesn't define this */ +#ifndef NULL +#define NULL ((void *)0) +#endif #define BTRFS_IOCTL_MAGIC 0x94 #define BTRFS_VOL_NAME_MAX 255 -- 2.5.0