From patchwork Thu Apr 21 20:17:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 8903751 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DA52C9F457 for ; Thu, 21 Apr 2016 20:16:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F03DE20320 for ; Thu, 21 Apr 2016 20:16:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1C1442026F for ; Thu, 21 Apr 2016 20:16:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 975966ED93; Thu, 21 Apr 2016 20:16:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7EBE6ED91 for ; Thu, 21 Apr 2016 20:16:23 +0000 (UTC) Received: by mail-wm0-x22a.google.com with SMTP id n3so150678151wmn.0 for ; Thu, 21 Apr 2016 13:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zsLabJzCN8p91pdRTTHKreJb0FjHR8CVVfacIBxyWT0=; b=LPJicYVnbGhvaOAA3kAE/dimWqg+KHSw2yrs5fjOPCwTPti9SdIHHYQU/eR+32NSu/ Z1JOsQkS9iAVUWRfsXwdBytlrjhhsmu6GL3kBLOKRDF+GQbr/+jTt35rNpPKpm+LRgM+ BNs8wwklRlChuWM9Sh+Xe0B4h4RduSaQXaYmTtXzetmkSpvJXG8g6l4hDC0Z3stfFXZZ 3Awfysk+tU815/GcJxgwJffFhm/hG+/GFGz5/NRjZ0mskvaqKp+XS53CMPieDrk1XoHt jdvdrrW58odRSv6ptyNqqKuY/HCopdcOTg4mqovnnzkTAMgmZQjOIutszHiCbCuuutml yjUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zsLabJzCN8p91pdRTTHKreJb0FjHR8CVVfacIBxyWT0=; b=eN9iWHWr/0XdaLmmi4oZsrBQziggyeAyIaBkwJhzdGgfEFxrb54KaPYI1ysKs1RaNP c55KO6uYDGCSZ8NT1M/5KnbZvHwLxcVRQEhI2PC6iWtFrEqv6/uvwWOj0pUga68ogv8W JTzGazbQSVnrsS0WD34z6iUzcbhBuEKT+zkY/KmoDmBH7n0QgQ5nyaF14xuJa5C0bNaH tzbDuvj3E9fbTv7nB39QoCtZOYayhGhztU/rEDS5zNeBey9IoK+4kvC0imJw5AdFswB5 /lfLfYobb3q+W26TqYIzGHQyzAJytJhfcrpe/hS6tvsFz7HFLtVGki1RFXB1GtQLNB+l m7dg== X-Gm-Message-State: AOPr4FXjel4CA7Gq7MZT9jbSFYcgZdvulQe4q3SSt5raPAYsMrkqulyWOvbHgfQmMGPBXQ== X-Received: by 10.28.189.10 with SMTP id n10mr39852436wmf.101.1461269782307; Thu, 21 Apr 2016 13:16:22 -0700 (PDT) Received: from arch-laptop.localdomain (cpc98192-croy26-2-0-cust395.19-2.cable.virginm.net. [82.32.159.140]) by smtp.gmail.com with ESMTPSA id ry15sm4486004wjb.19.2016.04.21.13.16.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Apr 2016 13:16:21 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 03/24] drm: add extern C guard for the UAPI headers Date: Thu, 21 Apr 2016 21:17:16 +0100 Message-Id: <1461269857-12813-4-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1461269857-12813-1-git-send-email-emil.l.velikov@gmail.com> References: <1461269857-12813-1-git-send-email-emil.l.velikov@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Emil Velikov --- include/uapi/drm/drm.h | 16 ++++++++++++++++ include/uapi/drm/drm_fourcc.h | 8 ++++++++ include/uapi/drm/drm_mode.h | 8 ++++++++ include/uapi/drm/drm_sarea.h | 8 ++++++++ 4 files changed, 40 insertions(+) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 3683250..452675f 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -65,6 +65,10 @@ typedef unsigned long drm_handle_t; #endif +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ @@ -691,8 +695,16 @@ struct drm_prime_handle { __s32 fd; }; +#if defined(__cplusplus) +} +#endif + #include "drm_mode.h" +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_IOCTL_BASE 'd' #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) #define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) @@ -886,4 +898,8 @@ typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_set_version drm_set_version_t; #endif +#if defined(__cplusplus) +} +#endif + #endif diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 4d8da69..a5890bf 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -26,6 +26,10 @@ #include "drm.h" +#if defined(__cplusplus) +extern "C" { +#endif + #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ ((__u32)(c) << 16) | ((__u32)(d) << 24)) @@ -229,4 +233,8 @@ */ #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) +#if defined(__cplusplus) +} +#endif + #endif /* DRM_FOURCC_H */ diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 7a7856e0..a4c5378 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -29,6 +29,10 @@ #include "drm.h" +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_DISPLAY_INFO_LEN 32 #define DRM_CONNECTOR_NAME_LEN 32 #define DRM_DISPLAY_MODE_LEN 32 @@ -621,4 +625,8 @@ struct drm_mode_destroy_blob { __u32 blob_id; }; +#if defined(__cplusplus) +} +#endif + #endif diff --git a/include/uapi/drm/drm_sarea.h b/include/uapi/drm/drm_sarea.h index 1d1a858..a951ced 100644 --- a/include/uapi/drm/drm_sarea.h +++ b/include/uapi/drm/drm_sarea.h @@ -34,6 +34,10 @@ #include "drm.h" +#if defined(__cplusplus) +extern "C" { +#endif + /* SAREA area needs to be at least a page */ #if defined(__alpha__) #define SAREA_MAX 0x2000U @@ -83,4 +87,8 @@ typedef struct drm_sarea_frame drm_sarea_frame_t; typedef struct drm_sarea drm_sarea_t; #endif +#if defined(__cplusplus) +} +#endif + #endif /* _DRM_SAREA_H_ */