1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
New patch to compile on kfreebsd
Index: testdisk-7.1/src/partgpt.c
===================================================================
--- testdisk-7.1.orig/src/partgpt.c
+++ testdisk-7.1/src/partgpt.c
@@ -38,8 +38,7 @@
#include <uuid.h>
#elif defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
-#endif
-#if defined(HAVE_SYS_UUID_H)
+#elif defined(HAVE_SYS_UUID_H)
#include <sys/uuid.h>
#endif
#include <assert.h>
Index: testdisk-7.1/src/partgptn.c
===================================================================
--- testdisk-7.1.orig/src/partgptn.c
+++ testdisk-7.1/src/partgptn.c
@@ -38,8 +38,7 @@
#include <uuid.h>
#elif defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
-#endif
-#if defined(HAVE_SYS_UUID_H)
+#elif defined(HAVE_SYS_UUID_H)
#include <sys/uuid.h>
#endif
#include "common.h"
Index: testdisk-7.1/src/partgptw.c
===================================================================
--- testdisk-7.1.orig/src/partgptw.c
+++ testdisk-7.1/src/partgptw.c
@@ -37,8 +37,7 @@
#include <uuid.h>
#elif defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
-#endif
-#if defined(HAVE_SYS_UUID_H)
+#elif defined(HAVE_SYS_UUID_H)
#include <sys/uuid.h>
#endif
#include "common.h"
|
