Mercurial > hg > octave-lyh
changeset 5621:7ef7b8388901
[project @ 2006-02-15 16:11:03 by jwe]
author | jwe |
---|---|
date | Wed, 15 Feb 2006 16:13:22 +0000 |
parents | 0225507842a1 |
children | 8b7046423d1e |
files | liboctave/ChangeLog liboctave/getopt.c src/ChangeLog src/oct-procbuf.cc |
diffstat | 4 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2006-02-15 John W. Eaton <jwe@octave.org> + + * getopt.c: Use __CYGWIN__ instead of __CYGWIN32__. + 2006-02-13 David Bateman <dbateman@free.fr> * Makefile.in (LINK_DEPS): Add missing dependencies on colamd,
--- a/liboctave/getopt.c +++ b/liboctave/getopt.c @@ -79,7 +79,7 @@ #endif #endif -#if defined (WIN32) && !defined (__CYGWIN32__) +#if defined (WIN32) && !defined (__CYGWIN__) /* It's not Unix, really. See? Capital letters. */ #include <stdlib.h> #include <windows.h>
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-02-15 John W. Eaton <jwe@octave.org> + + * oct-procbuf.cc (close): Use __CYGWIN__ instead of __CYGWIN32__. + 2006-02-13 David Bateman <dbateman@free.fr> * DLD_FUNCTIONS/regexp.cc (octregexp): Add matlab compatiable @@ -49,7 +53,7 @@ 2006-01-31 Kim Hansen <kim@i9.dk> - * __glpk__.cc (F_glpk__): Fix for sparse matrices. + * __glpk__.cc (F__glpk__): Fix for sparse matrices. 2006-01-30 John W. Eaton <jwe@octave.org>
--- a/src/oct-procbuf.cc +++ b/src/oct-procbuf.cc @@ -54,7 +54,7 @@ static octave_procbuf *octave_procbuf_list = 0; -#if defined (__CYGWIN32__) +#if defined (__CYGWIN__) #define W32POPEN popen #define W32PCLOSE pclose #elif defined (__MINGW32__) @@ -65,7 +65,7 @@ octave_procbuf * octave_procbuf::open (const char *command, int mode) { -#if defined (__CYGWIN32__) || defined (__MINGW32__) +#if defined (__CYGWIN__) || defined (__MINGW32__) if (is_open ()) return 0; @@ -176,7 +176,7 @@ { -#if defined (__CYGWIN32__) || defined (__MINGW32__) +#if defined (__CYGWIN__) || defined (__MINGW32__) if (f) {