From: Paolo Borelli <pborelli@katamail.com>
Date: Wed, 25 Feb 2009 13:30:49 +0000 (+0000)
Subject: Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ddfe508c048e712b1ea99efea0d4c8b4218bfef6;p=dana%2Fcg-glib.git

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 c7dca62d..f15099e7 100644
--- 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 7ecc9fcc..8cbfcf11 100644
--- 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;