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.
parent
1860eff1da
commit
f03d683fa0
|
@ -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. \
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <getopt.h>
|
||||
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
/* #include "version.h" */
|
||||
|
||||
static const char *EXEC_NAME = "ntfscmp";
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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. \
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
#include <ntfs-3g/ntfstime.h>
|
||||
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
/* #include "version.h" */
|
||||
|
||||
static const char *EXEC_NAME = "ntfsinfo";
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#include <ntfs-3g/logging.h>
|
||||
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
/* #include "version.h" */
|
||||
|
||||
static const char *EXEC_NAME = "ntfslabel";
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
#include "utils.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
/* #include "version.h" */
|
||||
|
||||
static const char *EXEC_NAME = "ntfsls";
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
#include <ntfs-3g/runlist.h>
|
||||
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
/* #include "version.h" */
|
||||
|
||||
static const char *EXEC_NAME = "ntfsresize";
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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_ */
|
||||
|
|
Loading…
Reference in New Issue