|
1 | 1 | diff --git a/create.cc b/create.cc
|
2 |
| -index 11c4041..fcfcc41 100644 |
| 2 | +index 11c4041..06d628c 100644 |
3 | 3 | --- a/create.cc
|
4 | 4 | +++ b/create.cc
|
5 |
| -@@ -27,6 +27,11 @@ |
| 5 | +@@ -26,6 +26,8 @@ |
| 6 | + #if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \ |
6 | 7 | !defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
|
7 | 8 | #include <sys/sysmacros.h> // for major, minor
|
| 9 | ++#else |
| 10 | ++#include <sys/types.h> // for major, minor |
8 | 11 | #endif
|
9 |
| -+#if !defined(HAVE_MAJOR) && !defined(major) |
10 |
| -+/* Replacement for major/minor/makedev. */ |
11 |
| -+#define major(x) ((int)(0x00ff & ((x) >> 8))) |
12 |
| -+#define minor(x) ((int)(0xffff00ff & (x))) |
13 |
| -+#endif |
14 | 12 | #include <ftw.h>
|
15 | 13 | #include <grp.h>
|
16 |
| - #include <pwd.h> |
17 | 14 | diff --git a/decode.cc b/decode.cc
|
18 |
| -index 1742df2..31abc3f 100644 |
| 15 | +index 1742df2..6743491 100644 |
19 | 16 | --- a/decode.cc
|
20 | 17 | +++ b/decode.cc
|
21 |
| -@@ -30,6 +30,12 @@ |
| 18 | +@@ -29,6 +29,8 @@ |
| 19 | + #if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \ |
22 | 20 | !defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
|
23 | 21 | #include <sys/sysmacros.h> // for major, minor, makedev
|
| 22 | ++#else |
| 23 | ++#include <sys/types.h> // for major, minor, makedev |
24 | 24 | #endif
|
25 |
| -+#if !defined(HAVE_MAJOR) && !defined(major) |
26 |
| -+/* Replacement for major/minor/makedev. */ |
27 |
| -+#define major(x) ((int)(0x00ff & ((x) >> 8))) |
28 |
| -+#define minor(x) ((int)(0xffff00ff & (x))) |
29 |
| -+#define makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min))) |
30 |
| -+#endif |
31 | 25 | #include <lzlib.h>
|
32 | 26 |
|
33 |
| - #include "tarlz.h" |
34 | 27 | diff --git a/decode_lz.cc b/decode_lz.cc
|
35 |
| -index 15ac2a7..4bfc627 100644 |
| 28 | +index 15ac2a7..a31384b 100644 |
36 | 29 | --- a/decode_lz.cc
|
37 | 30 | +++ b/decode_lz.cc
|
38 |
| -@@ -30,6 +30,12 @@ |
| 31 | +@@ -29,6 +29,8 @@ |
| 32 | + #if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \ |
39 | 33 | !defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
|
40 | 34 | #include <sys/sysmacros.h> // for major, minor, makedev
|
| 35 | ++#else |
| 36 | ++#include <sys/types.h> // for major, minor, makedev |
41 | 37 | #endif
|
42 |
| -+#if !defined(HAVE_MAJOR) && !defined(major) |
43 |
| -+/* Replacement for major/minor/makedev. */ |
44 |
| -+#define major(x) ((int)(0x00ff & ((x) >> 8))) |
45 |
| -+#define minor(x) ((int)(0xffff00ff & (x))) |
46 |
| -+#define makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min))) |
47 |
| -+#endif |
48 | 38 | #include <lzlib.h>
|
49 | 39 |
|
50 |
| - #include "tarlz.h" |
0 commit comments