Mercurial > hg > octave-nkf

changeset 20692:54eec9c180cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* mex.h: Don't typdef bool if it is already defined.
author John W. Eaton <jwe@octave.org>
date Fri, 04 Sep 2015 16:26:58 -0400
parents fb6fe9b45c41
children c8ec0b72b7a6
files libinterp/corefcn/mex.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/mex.h
+++ b/libinterp/corefcn/mex.h
@@ -52,7 +52,7 @@
 
 typedef void mxArray;
 
-#if ! defined (__cplusplus)
+#if ! defined (__cplusplus) && ! defined (bool)
 typedef int bool;
 #endif