Mercurial > hg > xemacs-beta
diff src/xintrinsicp.h @ 412:697ef44129c6 r21-2-14
Import from CVS: tag r21-2-14
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:20:41 +0200 |
parents | 74fd4e045ea6 |
children |
line wrap: on
line diff
--- a/src/xintrinsicp.h Mon Aug 13 11:19:22 2007 +0200 +++ b/src/xintrinsicp.h Mon Aug 13 11:20:41 2007 +0200 @@ -19,11 +19,14 @@ /* Synched up with: Not in FSF. */ -#ifndef INCLUDED_xintrinsicp_h_ -#define INCLUDED_xintrinsicp_h_ +#undef CONST /* X11R4 header thinks it can define CONST */ #include <X11/Intrinsic.h> #include <X11/IntrinsicP.h> #include <X11/ObjectP.h> /* apparently some IntrinsicP.h don't have this */ -#endif /* INCLUDED_xintrinsicp_h_ */ +#ifdef CONST_IS_LOSING +# define CONST +#else +# define CONST const +#endif