From a0ee1d225d3605f61dd44b98d3fc7a0611deee0f Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Mon, 22 Nov 2010 14:59:25 +0100 Subject: [PATCH] Redirected libntfs includes in gnome-vfs-method.c to libntfs-3g. (And fixed Makefile.am accordingly.) --- libntfs/Makefile.am | 5 ++--- libntfs/gnome-vfs-method.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am index 450d043a..f99b40fd 100644 --- a/libntfs/Makefile.am +++ b/libntfs/Makefile.am @@ -42,9 +42,8 @@ gnomevfsmodulesconf_DATA = libntfs.conf endif libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS) -libntfs_gnomevfs_la_LIBADD = libntfs-3g.la -libntfs_gnomevfs_la_LIBS = $(LIBNTFS_GNOMEVFS_LIBS) -libntfs_gnomevfs_la_CFLAGS = $(LIBNTFS_GNOMEVFS_CFLAGS) +libntfs_gnomevfs_la_LIBS = $(NTFS_3G_MODULE_LIBS) $(LIBNTFS_GNOMEVFS_LIBS) +libntfs_gnomevfs_la_CFLAGS = $(NTFS_3G_MODULE_CFLAGS) $(LIBNTFS_GNOMEVFS_CFLAGS) libntfs_gnomevfs_la_SOURCES = \ gnome-vfs-method.c \ gnome-vfs-module.c diff --git a/libntfs/gnome-vfs-method.c b/libntfs/gnome-vfs-method.c index 28e5d8b7..ce2e93e4 100644 --- a/libntfs/gnome-vfs-method.c +++ b/libntfs/gnome-vfs-method.c @@ -25,7 +25,7 @@ #undef FALSE #undef TRUE -#include "types.h" /* for 'FALSE'/'TRUE' libntfs definition */ +#include /* for 'FALSE'/'TRUE' libntfs definition */ #define FALSE FALSE #define TRUE TRUE @@ -39,8 +39,8 @@ #endif #include -#include "volume.h" -#include "dir.h" +#include +#include static GnomeVFSMethod GnomeVFSMethod_static; G_LOCK_DEFINE_STATIC(GnomeVFSMethod_static);