From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756199AbcHVSj5 (ORCPT ); Mon, 22 Aug 2016 14:39:57 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:45991 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932758AbcHVShh (ORCPT ); Mon, 22 Aug 2016 14:37:37 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , David Sterba , Liu Bo , Jeff Mahoney , Josef Bacik , Chris Mason , Vinson Lee , Anand Jain , Hans van Kranenburg , =?UTF-8?q?Gabr=C3=ADel=20Arth=C3=BAr=20P=C3=A9tursson?= Subject: [PATCH v05 43/72] include/uapi/linux/btrfs.h: define NULL Date: Mon, 22 Aug 2016 20:33:00 +0200 Message-Id: <1471890809-4383-44-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi> References: <1471890809-4383-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: 2a02:8070:d18f:5c00:bc6b:5a80:6b8d:855c 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 ac5eacd..8865985 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.8.1