diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:24 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:24 +0000 |
| commit | 5b2b384c319513d102de3e009e1816399d93b81a (patch) | |
| tree | f215864d9e5c09faa8d1399349f02c724341e2de /include/X11/xpm.h | |
| parent | 2773a7214e282f6f673483f5233b880505947c3f (diff) | |
Joined with branch XORG-6_8_2.lg3d-rel-0-6-2lg3d-masterlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-2lg3d-dev-0-6-1-1
Diffstat (limited to 'include/X11/xpm.h')
| -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 */ |