Skip to content

Commit 0fe617f

Browse files
committed
tarlz: update build patch
Signed-off-by: Rui Chen <[email protected]>
1 parent 8858b5e commit 0fe617f

File tree

1 file changed

+15
-26
lines changed

1 file changed

+15
-26
lines changed

tarlz/0.24.patch

+15-26
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,39 @@
11
diff --git a/create.cc b/create.cc
2-
index 11c4041..fcfcc41 100644
2+
index 11c4041..06d628c 100644
33
--- a/create.cc
44
+++ b/create.cc
5-
@@ -27,6 +27,11 @@
5+
@@ -26,6 +26,8 @@
6+
#if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \
67
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
78
#include <sys/sysmacros.h> // for major, minor
9+
+#else
10+
+#include <sys/types.h> // for major, minor
811
#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
1412
#include <ftw.h>
1513
#include <grp.h>
16-
#include <pwd.h>
1714
diff --git a/decode.cc b/decode.cc
18-
index 1742df2..31abc3f 100644
15+
index 1742df2..6743491 100644
1916
--- a/decode.cc
2017
+++ b/decode.cc
21-
@@ -30,6 +30,12 @@
18+
@@ -29,6 +29,8 @@
19+
#if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \
2220
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
2321
#include <sys/sysmacros.h> // for major, minor, makedev
22+
+#else
23+
+#include <sys/types.h> // for major, minor, makedev
2424
#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
3125
#include <lzlib.h>
3226

33-
#include "tarlz.h"
3427
diff --git a/decode_lz.cc b/decode_lz.cc
35-
index 15ac2a7..4bfc627 100644
28+
index 15ac2a7..a31384b 100644
3629
--- a/decode_lz.cc
3730
+++ b/decode_lz.cc
38-
@@ -30,6 +30,12 @@
31+
@@ -29,6 +29,8 @@
32+
#if !defined __FreeBSD__ && !defined __OpenBSD__ && !defined __NetBSD__ && \
3933
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
4034
#include <sys/sysmacros.h> // for major, minor, makedev
35+
+#else
36+
+#include <sys/types.h> // for major, minor, makedev
4137
#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
4838
#include <lzlib.h>
4939

50-
#include "tarlz.h"

0 commit comments

Comments
 (0)