From 2c23dbf2cafaad72b1f45da915eb87a8f792fdb0 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed, 8 Dec 2004 01:16:48 +0000
Subject: //bugs.freedesktop.org/show_bug.cgi?id=830): Fix libXpm header
 (xpm.h) to     use the X11 function begin/end marker macros
 (_XFUNCPROTOBEGIN,     _XFUNCPROTOEND) instead of homegrown (native) C++
 code. Patch by Kevin     DeKorte <kdekorte@yahoo.com>.

---
 include/X11/xpm.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/X11/xpm.h b/include/X11/xpm.h
index 1cbc3a3..ed46133 100644
--- a/include/X11/xpm.h
+++ b/include/X11/xpm.h
@@ -284,9 +284,7 @@ typedef struct {
  * functions declarations
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+_XFUNCPROTOBEGIN
 
 /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
 /* Same for Amiga! */
@@ -440,10 +438,7 @@ extern "C" {
 
     FUNC(XpmFree, void, (void *ptr));
 
-#ifdef __cplusplus
-} /* for C++ V2.0 */
-#endif
-
+_XFUNCPROTOEND
 
 /* backward compatibility */
 
-- 
cgit v1.2.3