Mercurial > octave

changeset 20949:e456327188f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cdisplay.c: Additional programming notes.
author John W. Eaton <jwe@octave.org>
date Sat, 19 Dec 2015 09:15:23 -0500
parents babc439a224f
children 165ba7463ca9
files libinterp/corefcn/cdisplay.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/cdisplay.c	Sat Dec 19 07:57:38 2015 -0600
+++ b/libinterp/corefcn/cdisplay.c	Sat Dec 19 09:15:23 2015 -0500
@@ -39,7 +39,13 @@
 // Programming Note: This file exists so that we can hide system
 // header files that make heavy use of macros and C-style casts in a C
 // language file and avoid warnings about using old-style casts in C++.
-// Please do NOT eliminate this file and move code to display.cc.
+// Additionally, on OS X systems, including the Carbon.h header file
+// results in the declaration of a "panic" function that conflicts with
+// Octave's global panic function, so Carbon.h can't be included in any
+// file that also includes Octave's error.h header file.
+
+// Please do NOT eliminate this file and move code from here to
+// display.cc.
 
 const char *
 octave_get_display_info (int *ht, int *wd, int *dp, double *rx, double *ry,