From ddfe508c048e712b1ea99efea0d4c8b4218bfef6 Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Wed, 25 Feb 2009 13:30:49 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20570069=20=E2=80=93=20wrong=20preprocessor?= =?UTF-8?q?=20directive=20in=20gio/glocalfileinfo.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-02-25 Paolo Borelli Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c * glocalfileinfo.c: fix preprocessor condition. Patch by Markus Duft. svn path=/trunk/; revision=7910 --- gio/ChangeLog | 6 ++++++ gio/glocalfileinfo.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index c7dca62d1..f15099e76 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,9 @@ +2009-02-25 Paolo Borelli + + Bug 570069 – wrong preprocessor directive in gio/glocalfileinfo.c + + * glocalfileinfo.c: fix preprocessor condition. Patch by Markus Duft. + 2009-02-23 Alexander Larsson * glocalfile.c: diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 7ecc9fccd..8cbfcf11d 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;