Attachment 81972 Details for Bug 66556 – patch to fix compilation and linking issues with C++

patch to fix compilation and linking issues with C++

0001-Fix-compilation-and-linking-issues-with-C.patch (text/plain), 4.22 KB, created by Jochen Keil on 2013-07-03 18:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jochen Keil

Created: 2013-07-03 18:30:00 UTC

Size: 4.22 KB

patch

obsolete

>From 64b0b0ae5415a37677314bfe20f50adae117fc5b Mon Sep 17 00:00:00 2001
>From: Jochen Keil <jochen.keil@gmail.com>
>Date: Wed, 3 Jul 2013 20:26:43 +0200
>Subject: [PATCH] Fix compilation and linking issues with C++
>
>* template is a reserved keyword in C++: renamed to ptemplate
>* extern "C" gives the C++ compiler a hint about the C functions
>---
> renderutil/util.c           | 26 +++++++++++++-------------
> renderutil/xcb_renderutil.h | 10 +++++++++-
> 2 files changed, 22 insertions(+), 14 deletions(-)
>
>diff --git a/renderutil/util.c b/renderutil/util.c
>index 2d8840d..b4252ed 100644
>--- a/renderutil/util.c
>+++ b/renderutil/util.c
>@@ -41,7 +41,7 @@ xcb_render_util_find_visual_format (const xcb_render_query_pict_formats_reply_t
> xcb_render_pictforminfo_t *
> xcb_render_util_find_format (const xcb_render_query_pict_formats_reply_t	*formats,
> 			 unsigned long				mask,
>-			 const xcb_render_pictforminfo_t		*template,
>+			 const xcb_render_pictforminfo_t		*ptemplate,
> 			 int					count)
> {
>     xcb_render_pictforminfo_iterator_t i;
>@@ -50,40 +50,40 @@ xcb_render_util_find_format (const xcb_render_query_pict_formats_reply_t	*format
>     for (i = xcb_render_query_pict_formats_formats_iterator(formats); i.rem; xcb_render_pictforminfo_next(&i))
>     {
> 	if (mask & XCB_PICT_FORMAT_ID)
>-	    if (template->id != i.data->id)
>+	    if (ptemplate->id != i.data->id)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_TYPE)
>-	    if (template->type != i.data->type)
>+	    if (ptemplate->type != i.data->type)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_DEPTH)
>-	    if (template->depth != i.data->depth)
>+	    if (ptemplate->depth != i.data->depth)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_RED)
>-	    if (template->direct.red_shift != i.data->direct.red_shift)
>+	    if (ptemplate->direct.red_shift != i.data->direct.red_shift)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_RED_MASK)
>-	    if (template->direct.red_mask != i.data->direct.red_mask)
>+	    if (ptemplate->direct.red_mask != i.data->direct.red_mask)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_GREEN)
>-	    if (template->direct.green_shift != i.data->direct.green_shift)
>+	    if (ptemplate->direct.green_shift != i.data->direct.green_shift)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_GREEN_MASK)
>-	    if (template->direct.green_mask != i.data->direct.green_mask)
>+	    if (ptemplate->direct.green_mask != i.data->direct.green_mask)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_BLUE)
>-	    if (template->direct.blue_shift != i.data->direct.blue_shift)
>+	    if (ptemplate->direct.blue_shift != i.data->direct.blue_shift)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_BLUE_MASK)
>-	    if (template->direct.blue_mask != i.data->direct.blue_mask)
>+	    if (ptemplate->direct.blue_mask != i.data->direct.blue_mask)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_ALPHA)
>-	    if (template->direct.alpha_shift != i.data->direct.alpha_shift)
>+	    if (ptemplate->direct.alpha_shift != i.data->direct.alpha_shift)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_ALPHA_MASK)
>-	    if (template->direct.alpha_mask != i.data->direct.alpha_mask)
>+	    if (ptemplate->direct.alpha_mask != i.data->direct.alpha_mask)
> 		continue;
> 	if (mask & XCB_PICT_FORMAT_COLORMAP)
>-	    if (template->colormap != i.data->colormap)
>+	    if (ptemplate->colormap != i.data->colormap)
> 		continue;
> 	if (count-- == 0)
> 	    return i.data;
>diff --git a/renderutil/xcb_renderutil.h b/renderutil/xcb_renderutil.h
>index 6eb5923..77c5b7f 100644
>--- a/renderutil/xcb_renderutil.h
>+++ b/renderutil/xcb_renderutil.h
>@@ -27,6 +27,10 @@
> #define XCB_RENDERUTIL
> #include <xcb/render.h>
> 
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
> typedef enum xcb_pict_format_t {
> 	XCB_PICT_FORMAT_ID         = (1 << 0),
> 	XCB_PICT_FORMAT_TYPE       = (1 << 1),
>@@ -58,7 +62,7 @@ xcb_render_util_find_visual_format (const xcb_render_query_pict_formats_reply_t
> xcb_render_pictforminfo_t *
> xcb_render_util_find_format (const xcb_render_query_pict_formats_reply_t	*formats,
> 			 unsigned long				mask,
>-			 const xcb_render_pictforminfo_t		*template,
>+			 const xcb_render_pictforminfo_t		*ptemplate,
> 			 int					count);
> 
> xcb_render_pictforminfo_t *
>@@ -139,4 +143,8 @@ void
> xcb_render_util_composite_text_free (
> 	xcb_render_util_composite_text_stream_t *stream );
> 
>+#ifdef __cplusplus
>+}
>+#endif
>+
> #endif /* XCB_RENDERUTIL */
>-- 
>1.8.3.2
>

Actions: View

Attachments on bug 66556: 81972

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.