diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-13 03:51:37 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-13 03:51:37 +0000 |
| commit | 49bb0a3ec1d9b781ec1d8a9fa21934979ddfc6a9 (patch) | |
| tree | 45ca970862571476a93bfcf30b8c1273c14bd4ac | |
| parent | 19066719975d0dbfa51c6b413a3760ed7cf93ddc (diff) | |
//bugs.freedesktop.org/show_bug.cgi?id=830) attachment #1493
(https://bugs.freedesktop.org/attachment.cgi?id=1493): 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>.
| -rw-r--r-- | include/X11/xpm.h | 9 |
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 */ |