# HG changeset patch
# User jwe
# Date 1165436599 0
# Node ID 323be5eeed1f9ba69f163a36e12c5440452794cf
# Parent  3c92b8d892dd62c20b33bdeeaa1cb0f15d2c6d42
[project @ 2006-12-06 20:23:18 by jwe]

diff -r 3c92b8d892dd -r 323be5eeed1f ChangeLog
--- a/ChangeLog	Wed Dec 06 20:19:16 2006 +0000
+++ b/ChangeLog	Wed Dec 06 20:23:19 2006 +0000
@@ -1,3 +1,7 @@
+2006-12-06  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* acx_blas.m4, acx_lapack.m4: Handle f2c calling convention.
+
 2006-12-05  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Don't check for strptime on *-apple-darwin* systems.
diff -r 3c92b8d892dd -r 323be5eeed1f acx_blas.m4
--- a/acx_blas.m4	Wed Dec 06 20:19:16 2006 +0000
+++ b/acx_blas.m4	Wed Dec 06 20:23:19 2006 +0000
@@ -47,8 +47,13 @@
 esac
 
 # Get fortran linker names of BLAS functions to check for.
-AC_F77_FUNC(sgemm)
-AC_F77_FUNC(dgemm)
+if $have_fortran_compiler; then 
+  AC_F77_FUNC(sgemm)
+  AC_F77_FUNC(dgemm)
+elif $have_f2c; then
+  sgemm=sgemm_
+  dgemm=dgemm_
+fi
 
 acx_blas_save_LIBS="$LIBS"
 LIBS="$LIBS $FLIBS"
diff -r 3c92b8d892dd -r 323be5eeed1f acx_lapack.m4
--- a/acx_lapack.m4	Wed Dec 06 20:19:16 2006 +0000
+++ b/acx_lapack.m4	Wed Dec 06 20:23:19 2006 +0000
@@ -44,7 +44,11 @@
 esac
 
 # Get fortran linker name of LAPACK function to check for.
-AC_F77_FUNC(cheev)
+if $have_fortran_compiler; then
+  AC_F77_FUNC(cheev)
+elif $have_f2c; then
+  cheev=cheev_
+fi
 
 # We cannot use LAPACK if BLAS is not found
 if test "x$acx_blas_ok" != xyes; then
diff -r 3c92b8d892dd -r 323be5eeed1f liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Dec 06 20:19:16 2006 +0000
+++ b/liboctave/ChangeLog	Wed Dec 06 20:23:19 2006 +0000
@@ -1,16 +1,22 @@
+2006-12-06  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* lo-sysdep.cc (opendir): Avoid passing \\* to FindFirstFile.
+
+	* file-ops.cc (ops::canonicalize_file_name): Provide partial
+	implementatino for Windows.
+
 2006-12-06  David Bateman  <dbateman@free.fr>
 
-	* dSparse.cc (SparseMatrix::is_symmetric(void) const): Faster
-	implementation.
-	* CSparse.cc (SparseComplexMatrix::is_symmetric(void) const): ditto.
+	* dSparse.cc (SparseMatrix::is_symmetric): Faster implementation.
+	* CSparse.cc (SparseComplexMatrix::is_symmetric): Ditto.
 
 	* dMatrrix.cc (finverse): Old inverse method renamed inverse.
         (tinverse): New method for triangular matrices.
         (inverse): New function with matrix type probing.
         * dMatrix.h (finverse, tinverse, inverse): New and modified
         declarations.
-        * CMatrix.cc: ditto.
-        * CMatrix.h: ditto.
+        * CMatrix.cc: Ditto.
+        * CMatrix.h: Ditto.
 
 2006-12-06  John W. Eaton  <jwe@octave.org>
 
diff -r 3c92b8d892dd -r 323be5eeed1f liboctave/file-ops.cc
--- a/liboctave/file-ops.cc	Wed Dec 06 20:19:16 2006 +0000
+++ b/liboctave/file-ops.cc	Wed Dec 06 20:23:19 2006 +0000
@@ -438,7 +438,7 @@
 
   size_t resolved_size = absolute_name.length ();
 
-  while (1)
+  while (true)
     {
       resolved_size = 2 * resolved_size + 1;
 
@@ -457,6 +457,31 @@
 	}
     }
 
+#elif defined (__WIN32__)
+
+  int n = 1024;
+
+  std::string win_path (n, '\0');
+
+  while (true)
+    {
+      int status = GetFullPathName (name.c_str (), n, &win_path[0], NULL);
+
+      if (status == 0)
+        break;
+      else if (status < n)
+        {
+          win_path.resize (status);
+	  retval = win_path;
+	  break;
+        }
+      else
+        {
+          n *= 2;
+	  win_path.resize (n);
+        }
+    }
+
 #else
 
   // FIXME -- provide replacement here...
diff -r 3c92b8d892dd -r 323be5eeed1f liboctave/lo-sysdep.cc
--- a/liboctave/lo-sysdep.cc	Wed Dec 06 20:19:16 2006 +0000
+++ b/liboctave/lo-sysdep.cc	Wed Dec 06 20:23:19 2006 +0000
@@ -118,7 +118,10 @@
   static char buffer[MAX_PATH];
 
   strncpy (buffer, name, MAX_PATH);
-  strncat (buffer, "\\*", MAX_PATH);
+  if (buffer[strnlen(buffer, MAX_PATH)-1] != '\\')
+    strncat (buffer, "\\*", MAX_PATH);
+  else
+    strncat (buffer, "*", MAX_PATH);
   d->current = buffer;
   d->hnd = FindFirstFile (buffer, &(d->fd));
   if (d->hnd == INVALID_HANDLE_VALUE)
diff -r 3c92b8d892dd -r 323be5eeed1f src/ChangeLog
--- a/src/ChangeLog	Wed Dec 06 20:19:16 2006 +0000
+++ b/src/ChangeLog	Wed Dec 06 20:23:19 2006 +0000
@@ -7,6 +7,9 @@
 
 2006-12-06  John W. Eaton  <jwe@octave.org>
 
+	* sysdep.cc: Include "Cell.h" here.
+	* input.h: Include "oct-obj.h", not "ov-list.h".
+
 2006-12-06  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* mappers.cc (install_mapper_functions): Undefine isascii before
diff -r 3c92b8d892dd -r 323be5eeed1f src/input.h
--- a/src/input.h	Wed Dec 06 20:19:16 2006 +0000
+++ b/src/input.h	Wed Dec 06 20:23:19 2006 +0000
@@ -31,6 +31,7 @@
 #include <string>
 
 #include "oct-time.h"
+#include "oct-obj.h"
 #include "pager.h"
 
 class octave_value;
diff -r 3c92b8d892dd -r 323be5eeed1f src/sysdep.cc
--- a/src/sysdep.cc	Wed Dec 06 20:19:16 2006 +0000
+++ b/src/sysdep.cc	Wed Dec 06 20:23:19 2006 +0000
@@ -77,6 +77,7 @@
 #include "oct-env.h"
 #include "quit.h"
 
+#include "Cell.h"
 #include "defun.h"
 #include "error.h"
 #include "input.h"