gnome-vfs r5506 - trunk

[tml svn gnome org]

Author: tml
Date: Fri Sep 12 00:23:31 2008
New Revision: 5506
URL: http://svn.gnome.org/viewvc/gnome-vfs?rev=5506&view=rev

Log:
2008-09-12  Tor Lillqvist  <tml novell com>

	* xdgmime.win32.diff: Update to match current
	libgnomevfs/xdgmime*.[ch]. Drop the #warning if not HAVE_MMAP as
	configure.in wants this to be compiled with -Werror...



Modified:
   trunk/ChangeLog
   trunk/xdgmime.win32.diff

Modified: trunk/xdgmime.win32.diff
==============================================================================
--- trunk/xdgmime.win32.diff	(original)
+++ trunk/xdgmime.win32.diff	Fri Sep 12 00:23:31 2008
@@ -183,7 +183,7 @@
 ===================================================================
 --- libgnomevfs/xdgmimecache.c	(revision 5502)
 +++ libgnomevfs/xdgmimecache.c	(working copy)
-@@ -37,7 +37,11 @@
+@@ -37,12 +37,15 @@
  #include <fnmatch.h>
  #include <assert.h>
  
@@ -195,6 +195,11 @@
  
  #ifdef HAVE_MMAP
  #include <sys/mman.h>
+ #else
+-#warning Building xdgmime without MMAP support. Binary "mime.info" cache files will not be used.
+ #endif
+ 
+ #include <sys/stat.h>
 @@ -688,7 +692,7 @@
  
    if (!statbuf)