Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c

2009-02-25  Paolo Borelli  <pborelli@katamail.com>

	Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c

	* glocalfileinfo.c: fix preprocessor condition. Patch by Markus Duft.

svn path=/trunk/; revision=7910

diff --git a/gio/ChangeLog b/gio/ChangeLog
index c7dca62d1e40ae7dffd16ec06f43ff9ae9f5013b..f15099e76454cbc33044e0ea5f0d7aba39fcc5cd 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-25  Paolo Borelli  <pborelli@katamail.com>
+
+       Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c
+
+       * glocalfileinfo.c: fix preprocessor condition. Patch by Markus Duft.
+
 2009-02-23  Alexander Larsson  <alexl@redhat.com>
 
        * glocalfile.c:

diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 7ecc9fccd81a07f93b757747d49ff8c7f4151f28..8cbfcf11d45d35a33b31c3f2522c0f12a1b6a5f8 100644 (file)
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -2171,7 +2171,7 @@ _g_local_file_info_set_attributes  (char                 *filename,
 #ifdef HAVE_UTIMES
   GFileAttributeValue *mtime, *mtime_usec, *atime, *atime_usec;
 #endif
-#if defined (HAVE_CHOWN) && defined (HAVE_UTIMES)
+#if defined (HAVE_CHOWN) || defined (HAVE_UTIMES)
   GFileAttributeStatus status;
 #endif
   gboolean res;