Mercurial > octave-nkf

diff libinterp/corefcn/mex.h @ 20517: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 4197fc428c7d
children 3aea4200da40
line wrap: on
line diff
--- a/libinterp/corefcn/mex.h	Fri Sep 04 13:12:57 2015 -0700
+++ b/libinterp/corefcn/mex.h	Fri Sep 04 16:26:58 2015 -0400
@@ -52,7 +52,7 @@
 
 typedef void mxArray;
 
-#if ! defined (__cplusplus)
+#if ! defined (__cplusplus) && ! defined (bool)
 typedef int bool;
 #endif