make it compile with mvc6 default sdk, (#define INVALID_FILE_ATTRIBUTES,

2005-01-09  Hans Breuer  <hans@breuer.org>

	* glib/gfileutils.c : make it compile with mvc6 default sdk,
	(#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)

diff --git a/ChangeLog b/ChangeLog
index 52c9198..824df04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2005-01-09  Hans Breuer  <hans@breuer.org>
+
+       * glib/gfileutils.c : make it compile with mvc6 default sdk,
+       (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)
+
 2005-01-09  Tor Lillqvist  <tlillqvist@novell.com>
 
-       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger
-       Leigh)
+       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh)
 
        * glib/gfileutils.c: Include <io.h> on Windows for
        prototypes. (#163390, Kazuki Iwamoto)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 52c9198..824df04 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,11 @@
+2005-01-09  Hans Breuer  <hans@breuer.org>
+
+       * glib/gfileutils.c : make it compile with mvc6 default sdk,
+       (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)
+
 2005-01-09  Tor Lillqvist  <tlillqvist@novell.com>
 
-       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger
-       Leigh)
+       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh)
 
        * glib/gfileutils.c: Include <io.h> on Windows for
        prototypes. (#163390, Kazuki Iwamoto)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 52c9198..824df04 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,7 +1,11 @@
+2005-01-09  Hans Breuer  <hans@breuer.org>
+
+       * glib/gfileutils.c : make it compile with mvc6 default sdk,
+       (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)
+
 2005-01-09  Tor Lillqvist  <tlillqvist@novell.com>
 
-       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger
-       Leigh)
+       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh)
 
        * glib/gfileutils.c: Include <io.h> on Windows for
        prototypes. (#163390, Kazuki Iwamoto)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 52c9198..824df04 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,11 @@
+2005-01-09  Hans Breuer  <hans@breuer.org>
+
+       * glib/gfileutils.c : make it compile with mvc6 default sdk,
+       (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)
+
 2005-01-09  Tor Lillqvist  <tlillqvist@novell.com>
 
-       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger
-       Leigh)
+       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh)
 
        * glib/gfileutils.c: Include <io.h> on Windows for
        prototypes. (#163390, Kazuki Iwamoto)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 52c9198..824df04 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,11 @@
+2005-01-09  Hans Breuer  <hans@breuer.org>
+
+       * glib/gfileutils.c : make it compile with mvc6 default sdk,
+       (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE)
+
 2005-01-09  Tor Lillqvist  <tlillqvist@novell.com>
 
-       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger
-       Leigh)
+       * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh)
 
        * glib/gfileutils.c: Include <io.h> on Windows for
        prototypes. (#163390, Kazuki Iwamoto)

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 6868d0e..16edd70 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -107,6 +107,13 @@ g_file_test (const gchar *filename,
              GFileTest    test)
 {
 #ifdef G_OS_WIN32
+/* stuff missing in std vc6 api */
+#  ifndef INVALID_FILE_ATTRIBUTES
+#    define INVALID_FILE_ATTRIBUTES -1
+#  endif
+#  ifndef FILE_ATTRIBUTE_DEVICE
+#    define FILE_ATTRIBUTE_DEVICE 64
+#  endif
   int attributes;
 
   if (G_WIN32_HAVE_WIDECHAR_API ())