From f03d683fa073f0d3a81e63b4bed42be582872bfa Mon Sep 17 00:00:00 2001
From: Erik Larsson <mechie@users.sourceforge.net>
Date: Fri, 15 Jan 2010 09:33:54 +0100
Subject: [PATCH] Commented out all references to 'version.h' (which doesn't
 exist in libntfs-3g) and added a stub implementation of ntfs_libntfs_version
 in utils.h to allow things to compile.

---
 ntfsprogs/mkntfs.c       | 2 +-
 ntfsprogs/ntfscat.c      | 2 +-
 ntfsprogs/ntfsclone.c    | 2 +-
 ntfsprogs/ntfscluster.c  | 2 +-
 ntfsprogs/ntfscmp.c      | 2 +-
 ntfsprogs/ntfscp.c       | 2 +-
 ntfsprogs/ntfsfix.c      | 2 +-
 ntfsprogs/ntfsinfo.c     | 2 +-
 ntfsprogs/ntfslabel.c    | 2 +-
 ntfsprogs/ntfsls.c       | 2 +-
 ntfsprogs/ntfsresize.c   | 2 +-
 ntfsprogs/ntfsundelete.c | 2 +-
 ntfsprogs/utils.c        | 2 +-
 ntfsprogs/utils.h        | 4 ++++
 14 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index b32a223f..8156e368 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -146,7 +146,7 @@
 #include "upcase.h"
 #include "boot.h"
 #include "attrdef.h"
-#include "version.h"
+/* #include "version.h" */
 
 #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 #error "No default device io operations!  Cannot build mkntfs.  \
diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index 24635620..7cdcfb33 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -45,7 +45,7 @@
 #include <ntfs-3g/dir.h>
 
 #include "ntfscat.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfscat";
 static struct options opts;
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index afb5b41a..f8be691a 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -73,7 +73,7 @@
 #include <ntfs-3g/ntfstime.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 #if defined(linux) && defined(_IO) && !defined(BLKGETSIZE)
 #define BLKGETSIZE	_IO(0x12,96)  /* Get device size in 512-byte blocks. */
diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c
index df813706..8a218461 100644
--- a/ntfsprogs/ntfscluster.c
+++ b/ntfsprogs/ntfscluster.c
@@ -51,7 +51,7 @@
 #include "ntfscluster.h"
 #include "utils.h"
 #include "cluster.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfscluster";
 static struct options opts;
diff --git a/ntfsprogs/ntfscmp.c b/ntfsprogs/ntfscmp.c
index 777208ea..8fdf88b7 100644
--- a/ntfsprogs/ntfscmp.c
+++ b/ntfsprogs/ntfscmp.c
@@ -18,7 +18,7 @@
 #include <getopt.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfscmp";
 
diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c
index f6784232..0450e4c3 100644
--- a/ntfsprogs/ntfscp.c
+++ b/ntfsprogs/ntfscp.c
@@ -52,7 +52,7 @@
 #include <ntfs-3g/logging.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 struct options {
 	char		*device;	/* Device/File to work with */
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index 97bb2f00..a2869e4b 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -72,7 +72,7 @@
 #include <ntfs-3g/logging.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 #	error "No default device io operations!  Cannot build ntfsfix.  \
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index 646d4522..3c0d0a07 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -78,7 +78,7 @@
 #include <ntfs-3g/ntfstime.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfsinfo";
 
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index f3d1458a..392a06e3 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -49,7 +49,7 @@
 #include <ntfs-3g/logging.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfslabel";
 
diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c
index f8b3775f..c42e6d33 100644
--- a/ntfsprogs/ntfsls.c
+++ b/ntfsprogs/ntfsls.c
@@ -53,7 +53,7 @@
 
 #include "utils.h"
 #include "list.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfsls";
 
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index f0d3a4c2..6bf8a835 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -65,7 +65,7 @@
 #include <ntfs-3g/runlist.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfsresize";
 
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index bbf8c4b7..1e76bc25 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -85,7 +85,7 @@
 
 #include "ntfsundelete.h"
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 static const char *EXEC_NAME = "ntfsundelete";
 static const char *MFTFILE   = "mft";
diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c
index 42799a72..ee7cd9d7 100644
--- a/ntfsprogs/utils.c
+++ b/ntfsprogs/utils.c
@@ -71,7 +71,7 @@
 #include <ntfs-3g/logging.h>
 
 #include "utils.h"
-#include "version.h"
+/* #include "version.h" */
 
 const char *ntfs_bugs = "Developers' email address: "NTFS_DEV_LIST"\n";
 const char *ntfs_home = "Linux NTFS homepage: http://www.linux-ntfs.org\n";
diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h
index 0fc89883..b9743d16 100644
--- a/ntfsprogs/utils.h
+++ b/ntfsprogs/utils.h
@@ -101,4 +101,8 @@ int mft_next_record(struct mft_search_ctx *ctx);
 #define DM_BLUE		(1 << 5)
 #define DM_BOLD		(1 << 6)
 
+static __inline__ const char *ntfs_libntfs_version(void) {
+	return "ntfs-3g unknown version (TODO: find or create a way to extract ntfs-3g version from library)";
+}
+
 #endif /* _NTFS_UTILS_H_ */