changeset 11735:24bdee332170 release-3-0-x

lo-sysdep.cc: include windows.h if windows and not cygwin
author John W. Eaton <jwe@octave.org>
date Thu, 03 Apr 2008 22:23:22 -0400
parents 48ca45939fcc
children 9d412bc1d54f
files liboctave/ChangeLog liboctave/lo-sysdep.cc
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Thu Apr 03 22:20:04 2008 -0400
+++ b/liboctave/ChangeLog	Thu Apr 03 22:23:22 2008 -0400
@@ -1,3 +1,7 @@
+2008-04-03  John W. Eaton  <jwe@octave.org>
+
+	* lo-sysdep.cc [__WIN32__ && ! __CYGWIN__]: Include windows.h.
+
 2008-03-26  David Bateman  <dbateman@feee.fr>
 
 	* Array.cc (assignN): refactor calculation of new dimensions when
--- a/liboctave/lo-sysdep.cc	Thu Apr 03 22:20:04 2008 -0400
+++ b/liboctave/lo-sysdep.cc	Thu Apr 03 22:23:22 2008 -0400
@@ -39,6 +39,10 @@
 #include <fcntl.h>
 #endif
 
+#if defined (__WIN32__) && ! defined (__CYGWIN__)
+#include <windows.h>
+#endif
+
 #include "file-ops.h"
 #include "lo-error.h"
 #include "pathlen.h"
@@ -174,8 +178,6 @@
 // complete implementations (do the functions below work for network
 // paths, for example)?  We can probably get along without rewinddir.
 
-#include <windows.h>
-
 struct __DIR
 {
   HANDLE hnd;