Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.2394
diff -u -p -r1.2394 ChangeLog
--- ChangeLog	27 Mar 2006 09:04:49 -0000	1.2394
+++ ChangeLog	28 Mar 2006 18:05:21 -0000
@@ -1,3 +1,9 @@
+2006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* libgnomevfs/xdgmimemagic.c, modules/fstype.c: Removed the hardcoded
+	errno extern declaration as it clashes with the one in errno.h.
+	Fixes build under Dragonfly BSD and closes bug #336382.
+
 2006-03-27  Alexander Larsson  <alexl@redhat.com>
 
 	* libgnomevfs/gnome-vfs-unix-mounts.c (_gnome_vfs_get_unix_mount_table):
Index: libgnomevfs/xdgmimemagic.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/xdgmimemagic.c,v
retrieving revision 1.14
diff -u -p -r1.14 xdgmimemagic.c
--- libgnomevfs/xdgmimemagic.c	27 Feb 2006 10:14:33 -0000	1.14
+++ libgnomevfs/xdgmimemagic.c	28 Mar 2006 18:05:21 -0000
@@ -47,8 +47,6 @@
 #define	TRUE	(!FALSE)
 #endif
 
-extern int errno;
-
 typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;
 typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet;
 
Index: modules/fstype.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/fstype.c,v
retrieving revision 1.10
diff -u -p -r1.10 fstype.c
--- modules/fstype.c	12 Aug 2004 09:08:56 -0000	1.10
+++ modules/fstype.c	28 Mar 2006 18:05:21 -0000
@@ -41,8 +41,6 @@
 #include <errno.h>
 #ifdef STDC_HEADERS
 #include <stdlib.h>
-#else
-extern int errno;
 #endif
 #include <string.h>
 #include <glib.h>