Changeset 47b571d

Timestamp:

2008-06-28T17:35:34Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

913545e

Parents:

178e2f8

Message:

Avoid g_access on GLib < 2.8.0.

File:

• storage_xml.c (modified) (2 diffs)

storage_xml.c

@@ -30 +30 @@
 #include "md5.h"
 #include <glib/gstdio.h>
+
+#if !GLIB_CHECK_VERSION(2,8,0)
+/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
+#define g_access access
+#endif
 
 typedef enum
@@ -246 +251 @@
         if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) )
                 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
-        else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 )
+        else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || 
+                         g_access( global.conf->configdir, W_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }