summaryrefslogtreecommitdiff
path: root/include/X11/xpm.h
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-02-11 10:53:05 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-02-11 10:53:05 +0000
commitdf39054c869d26b1aeeaca958b54869521802712 (patch)
treef9ace3a7fc35498f101ec41da1d83edf47ccbd06 /include/X11/xpm.h
parentc3ba808aef8fcf59b04eb959e9958159648eae8a (diff)
Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGECYGWIN
Diffstat (limited to 'include/X11/xpm.h')
-rw-r--r--include/X11/xpm.h9
1 files 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 */