From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 17 Dec 2007 10:53:53 +0000 (+0000)
Subject: Add missing #ifdef fixing OSX build. (#503334, patch from Richard Hult)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6ad96b367793557d0a02c1bff75cc60befcd59a6;p=dana%2Fcg-glib.git

Add missing #ifdef fixing OSX build. (#503334, patch from Richard Hult)

2007-12-17  Alexander Larsson  <alexl@redhat.com>

        * gunixmounts.c:
	Add missing #ifdef fixing OSX build.
	(#503334, patch from Richard Hult)



svn path=/trunk/; revision=6141
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 0bc706cc..1fb8a942 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Alexander Larsson  <alexl@redhat.com>
+
+        * gunixmounts.c:
+	Add missing #ifdef fixing OSX build.
+	(#503334, patch from Richard Hult)
+
 2007-12-14  David Zeuthen  <davidz@redhat.com>
 
 	* Makefile.am:
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index c5f488e3..b3d7b4dc 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1938,6 +1938,7 @@ _resolve_symlink (const char *file)
   return f;
 }
 
+#ifdef HAVE_MNTENT_H
 static const char *
 _resolve_dev_root (void)
 {
@@ -1998,6 +1999,7 @@ _resolve_dev_root (void)
  found:
   return real_dev_root;
 }
+#endif
 
 #define __G_UNIX_MOUNTS_C__
 #include "gioaliasdef.c"