# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1202868801 18000
# Node ID 8b22207ef9ca72a3be34f331da6aeb039d07f9aa
# Parent  e9f10b4c05cf3e7ae35764e5186294079ee76ffd
ilaenv --> xilaenv

diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-12  John W. Eaton  <jwe@octave.org>
+
+	* lapack-xtra/xilaenv.f: New wrapper for Fortran function ilaenv.
+
 2008-02-06  John W. Eaton  <jwe@octave.org>
 
 	* Makerules.in (%.def : %.f): Use mv instead of move-if-change.
diff --git a/libcruft/lapack-xtra/xilaenv.f b/libcruft/lapack-xtra/xilaenv.f
new file mode 100644
--- /dev/null
+++ b/libcruft/lapack-xtra/xilaenv.f
@@ -0,0 +1,6 @@
+      subroutine xilaenv (ispec, name, opts, n1, n2, n3, n4, retval)
+      character*(*) name, opts
+      integer ilaenv, ispec, n1, n2, n3, n4, retval
+      retval = ilaenv (ispec, name, opts, n1, n2, n3, n4)
+      return
+      end
diff --git a/liboctave/CMatrix.cc b/liboctave/CMatrix.cc
--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -63,12 +63,13 @@
 
 extern "C"
 {
-  octave_idx_type
-  F77_FUNC (ilaenv, ILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
-			     F77_CONST_CHAR_ARG_DECL,
-			     const octave_idx_type&, const octave_idx_type&,
-			     const octave_idx_type&, const octave_idx_type&
-			     F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL);
+  F77_RET_T
+  F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
+			       F77_CONST_CHAR_ARG_DECL,
+			       const octave_idx_type&, const octave_idx_type&,
+			       const octave_idx_type&, const octave_idx_type&
+			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL,
+			       octave_idx_type&);
 
   F77_RET_T
   F77_FUNC (zgebal, ZGEBAL) (F77_CONST_CHAR_ARG_DECL,
@@ -2499,12 +2500,12 @@
 
       Array<Complex> work (1);
 
-      const octave_idx_type smlsiz
-	= F77_FUNC (ilaenv, ILAENV) (9, F77_CONST_CHAR_ARG2 ("ZGELSD", 6),
-				     F77_CONST_CHAR_ARG2 (" ", 1),
-				     0, 0, 0, 0
-				     F77_CHAR_ARG_LEN (6)
-				     F77_CHAR_ARG_LEN (1));
+      octave_idx_type smlsiz;
+      F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("ZGELSD", 6),
+				   F77_CONST_CHAR_ARG2 (" ", 1),
+				   0, 0, 0, 0
+				   F77_CHAR_ARG_LEN (6)
+				   F77_CHAR_ARG_LEN (1), smlsiz);
 
       // We compute the size of rwork and iwork because ZGELSD in
       // older versions of LAPACK does not return them on a query
diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12  John W. Eaton  <jwe@octave.org>
+
+	* CMatrix.cc: Declare xilaenv instead of ilaenv.
+	(ComplexMatrix::lssolve): Call xilaenv instead of ilaenv.
+
 2008-02-12  Jason Riedy  <ejr@cs.berkeley.edu>
   
 	* dMatrix.cc (ILAENV): Declare LAPACK Fortran function.
diff --git a/liboctave/dMatrix.cc b/liboctave/dMatrix.cc
--- a/liboctave/dMatrix.cc
+++ b/liboctave/dMatrix.cc
@@ -60,11 +60,12 @@
 extern "C"
 {
   octave_idx_type
-  F77_FUNC (ilaenv, ILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
-			     F77_CONST_CHAR_ARG_DECL,
-			     const octave_idx_type&, const octave_idx_type&,
-			     const octave_idx_type&, const octave_idx_type&
-			     F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL);
+  F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
+			       F77_CONST_CHAR_ARG_DECL,
+			       const octave_idx_type&, const octave_idx_type&,
+			       const octave_idx_type&, const octave_idx_type&
+			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL,
+			       octave_idx_type&);
 
   F77_RET_T
   F77_FUNC (dgebal, DGEBAL) (F77_CONST_CHAR_ARG_DECL,
@@ -2110,12 +2111,12 @@
 
       Array<double> work (1);
 
-      const octave_idx_type smlsiz
-	= F77_FUNC (ilaenv, ILAENV) (9, F77_CONST_CHAR_ARG2 ("DGELSD", 6),
-				     F77_CONST_CHAR_ARG2 (" ", 1),
-				     0, 0, 0, 0
-				     F77_CHAR_ARG_LEN (6)
-				     F77_CHAR_ARG_LEN (1));
+      octave_idx_type smlsiz;
+      F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("DGELSD", 6),
+				   F77_CONST_CHAR_ARG2 (" ", 1),
+				   0, 0, 0, 0
+				   F77_CHAR_ARG_LEN (6)
+				   F77_CHAR_ARG_LEN (1), smlsiz);
 
       // We compute the size of iwork because DGELSD in older versions
       // of LAPACK does not return it on a query call.