diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2013-01-10 15:32:54 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2013-01-10 15:32:54 +0000 |
| commit | b3e94e67bbac479b6b3024b8db4eb31ee941ac60 (patch) | |
| tree | 6887d542782e8fcc34be27d82483d4d8d2dc9426 /Build | |
| parent | 0b095c9b5835bd49a04f77262f8007542330d140 (diff) | |
Add #ifndef __cplusplus ... #endif for #define bool boolean
git-svn-id: svn://tug.org/texlive/trunk@28789 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index f897c639443..5ab760dc9ec 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-01-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * XeTeX_ext.h: Add #ifndef __cplusplus ... #endif for + #define bool boolean to avoid compile error in cplusplus files. + 2013-01-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * XeTeX_ext.c: Move u_getVersion(icuVersion) etc. below variable diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h index 2a0b3039d40..828801de5d1 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h @@ -236,8 +236,10 @@ extern FT_Library gFreeTypeLibrary; #else /* boolean is an enum type from kpathsea/types.h loaded in kpathsea/kpathsea.h, use it as fallback */ +#ifndef __cplusplus # define bool boolean #endif +#endif #include "XeTeXLayoutInterface.h" |