*** include/X11/xpm.h.orig	2004-09-02 11:12:58.948621749 -0600
--- include/X11/xpm.h	2004-09-02 11:18:08.846948657 -0600
*************** typedef struct {
*** 284,292 ****
   * functions declarations
   */
  
! #ifdef __cplusplus
! extern "C" {
! #endif
  
  /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
  /* Same for Amiga! */
--- 284,290 ----
   * functions declarations
   */
  
! _XFUNCPROTOBEGIN
  
  /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
  /* Same for Amiga! */
*************** extern "C" {
*** 417,423 ****
  					    Pixmap shapemask,
  					    XpmImage *xpmimage,
  					    XpmAttributes *attributes));
! #endif
      FUNC(XpmCreateDataFromXpmImage, int, (char ***data_return,
  					  XpmImage *image,
  					  XpmInfo *info));
--- 415,421 ----
  					    Pixmap shapemask,
  					    XpmImage *xpmimage,
  					    XpmAttributes *attributes));
! endif
      FUNC(XpmCreateDataFromXpmImage, int, (char ***data_return,
  					  XpmImage *image,
  					  XpmInfo *info));
*************** extern "C" {
*** 440,448 ****
  
      FUNC(XpmFree, void, (void *ptr));
  
! #ifdef __cplusplus
! } /* for C++ V2.0 */
! #endif
  
  
  /* backward compatibility */
--- 438,444 ----
  
      FUNC(XpmFree, void, (void *ptr));
  
! _XFUNCPROTOEND
  
  
  /* backward compatibility */