# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1453393476 18000
# Node ID ba0a4b4f021da2e85c1da6049ddabc819c340383
# Parent  8f76684324b5561ad0c9613b6378691071512197
include errwarn.h in files that use err_disabled_feature conditionally

* file-io.cc, __delaunayn__.cc, __fltk_uigetfile__.cc,
__init_fltk__.cc, __voronoi__.cc, convhulln.cc: Include errwarn.h.
* __voronoi__.cc: Define CALLER for __err_disabled_feature when
HAVE_QHULL is not defined.

diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/corefcn/file-io.cc
--- a/libinterp/corefcn/file-io.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/corefcn/file-io.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -62,6 +62,7 @@
 #include "oct-locbuf.h"
 
 #include "defun.h"
+#include "errwarn.h"
 #include "file-io.h"
 #include "load-path.h"
 #include "oct-fstrm.h"
diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/dldfcn/__delaunayn__.cc
--- a/libinterp/dldfcn/__delaunayn__.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/dldfcn/__delaunayn__.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -50,6 +50,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
+#include "errwarn.h"
 #include "ovl.h"
 #include "unwind-prot.h"
 
diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/dldfcn/__fltk_uigetfile__.cc
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/dldfcn/__fltk_uigetfile__.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -42,6 +42,7 @@
 #endif
 
 #include "defun-dld.h"
+#include "errwarn.h"
 #include "file-ops.h"
 
 DEFUN_DLD (__fltk_uigetfile__, args, ,
diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/dldfcn/__init_fltk__.cc
--- a/libinterp/dldfcn/__init_fltk__.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/dldfcn/__init_fltk__.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -40,6 +40,7 @@
 #include "builtin-defun-decls.h"
 #include "defun-dld.h"
 #include "error.h"
+#include "errwarn.h"
 #include "ov-fcn-handle.h"
 
 #ifdef HAVE_FLTK
diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/dldfcn/__voronoi__.cc
--- a/libinterp/dldfcn/__voronoi__.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/dldfcn/__voronoi__.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -44,6 +44,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
+#include "errwarn.h"
 #include "ovl.h"
 #include "unwind-prot.h"
 
@@ -327,6 +328,11 @@
   return retval;
 
 #else
+  std::string caller
+    = (args.length () > 0
+       ? args(0).xstring_value ("__voronoi__: CALLER must be a string")
+       : std::string ("__voronoi__"));
+
   err_disabled_feature (caller, "Qhull");
 #endif
 }
diff -r 8f76684324b5 -r ba0a4b4f021d libinterp/dldfcn/convhulln.cc
--- a/libinterp/dldfcn/convhulln.cc	Wed Jan 20 22:19:02 2016 -0800
+++ b/libinterp/dldfcn/convhulln.cc	Thu Jan 21 11:24:36 2016 -0500
@@ -38,6 +38,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
+#include "errwarn.h"
 #include "ovl.h"
 #include "parse.h"
 #include "unwind-prot.h"