From c21df964daee66d084f832e10be0679f0eb64a48 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 9 Jan 2005 21:43:40 +0000 Subject: [PATCH] make it compile with mvc6 default sdk, (#define INVALID_FILE_ATTRIBUTES, 2005-01-09 Hans Breuer * glib/gfileutils.c : make it compile with mvc6 default sdk, (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) --- ChangeLog | 8 ++++++-- ChangeLog.pre-2-10 | 8 ++++++-- ChangeLog.pre-2-12 | 8 ++++++-- ChangeLog.pre-2-6 | 8 ++++++-- ChangeLog.pre-2-8 | 8 ++++++-- glib/gfileutils.c | 7 +++++++ 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52c9198..824df04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ +2005-01-09 Hans Breuer + + * glib/gfileutils.c : make it compile with mvc6 default sdk, + (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) + 2005-01-09 Tor Lillqvist - * 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 on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 52c9198..824df04 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,11 @@ +2005-01-09 Hans Breuer + + * glib/gfileutils.c : make it compile with mvc6 default sdk, + (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) + 2005-01-09 Tor Lillqvist - * 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 on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 52c9198..824df04 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,7 +1,11 @@ +2005-01-09 Hans Breuer + + * glib/gfileutils.c : make it compile with mvc6 default sdk, + (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) + 2005-01-09 Tor Lillqvist - * 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 on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 52c9198..824df04 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,11 @@ +2005-01-09 Hans Breuer + + * glib/gfileutils.c : make it compile with mvc6 default sdk, + (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) + 2005-01-09 Tor Lillqvist - * 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 on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 52c9198..824df04 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,11 @@ +2005-01-09 Hans Breuer + + * glib/gfileutils.c : make it compile with mvc6 default sdk, + (#define INVALID_FILE_ATTRIBUTES, FILE_ATTRIBUTE_DEVICE) + 2005-01-09 Tor Lillqvist - * 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 on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 6868d0e..16edd70 100644 --- 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 ()) -- 2.7.4