tags 456884 + patch

Hi,

Here is a patch that works for me.  Hope you can use it.

Thanks,

Barry deFreese


diff -u testdisk-6.6/debian/changelog testdisk-6.6/debian/changelog
--- testdisk-6.6/debian/changelog
+++ testdisk-6.6/debian/changelog
@@ -1,3 +1,9 @@
+testdisk (6.6-2) unstable; urgency=low
+
+  * If ntfs list.h is already included, don't use "list.h"
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Fri, 21 Dec 2007 16:43:46 -0500
+
 testdisk (6.6-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- testdisk-6.6.orig/src/dir.h
+++ testdisk-6.6/src/dir.h
@@ -21,7 +21,9 @@
  */
 #ifndef _DIR_H
 #define _DIR_H
-#include "list.h"
+#ifndef _NTFS_LIST_H
+  #include "list.h"
+#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif

Reply via email to