Skip to content

Commit

Permalink
tarlz: add build patch for 0.24 release
Browse files Browse the repository at this point in the history
```
  create.cc:462:19: error: use of undeclared identifier 'major'
      if( (unsigned)major( st.st_rdev ) >= 2 << 20 ||
                    ^
  create.cc:463:19: error: use of undeclared identifier 'minor'
          (unsigned)minor( st.st_rdev ) >= 2 << 20 )
                    ^
  create.cc:466:55: error: use of undeclared identifier 'major'
      print_octal( header + devmajor_o, devmajor_l - 1, major( st.st_rdev ) );
                                                        ^
  create.cc:467:55: error: use of undeclared identifier 'minor'
      print_octal( header + devminor_o, devminor_l - 1, minor( st.st_rdev ) );
                                                        ^
  decode.cc:165:9: error: use of undeclared identifier 'makedev'
          makedev( parse_octal( header + devmajor_o, devmajor_l ),
          ^
  decode.cc:336:23: error: use of undeclared identifier 'major'
              (unsigned)major( st.st_rdev ) ||
                        ^
  decode.cc:338:23: error: use of undeclared identifier 'minor'
              (unsigned)minor( st.st_rdev ) ) )
                        ^
  4 errors generated.
```

Signed-off-by: Rui Chen <[email protected]>
  • Loading branch information
chenrui333 committed Oct 24, 2023
1 parent 81862a0 commit 8858b5e
Showing 1 changed file with 50 additions and 0 deletions.
50 changes: 50 additions & 0 deletions tarlz/0.24.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
diff --git a/create.cc b/create.cc
index 11c4041..fcfcc41 100644
--- a/create.cc
+++ b/create.cc
@@ -27,6 +27,11 @@
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
#include <sys/sysmacros.h> // for major, minor
#endif
+#if !defined(HAVE_MAJOR) && !defined(major)
+/* Replacement for major/minor/makedev. */
+#define major(x) ((int)(0x00ff & ((x) >> 8)))
+#define minor(x) ((int)(0xffff00ff & (x)))
+#endif
#include <ftw.h>
#include <grp.h>
#include <pwd.h>
diff --git a/decode.cc b/decode.cc
index 1742df2..31abc3f 100644
--- a/decode.cc
+++ b/decode.cc
@@ -30,6 +30,12 @@
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
#include <sys/sysmacros.h> // for major, minor, makedev
#endif
+#if !defined(HAVE_MAJOR) && !defined(major)
+/* Replacement for major/minor/makedev. */
+#define major(x) ((int)(0x00ff & ((x) >> 8)))
+#define minor(x) ((int)(0xffff00ff & (x)))
+#define makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min)))
+#endif
#include <lzlib.h>

#include "tarlz.h"
diff --git a/decode_lz.cc b/decode_lz.cc
index 15ac2a7..4bfc627 100644
--- a/decode_lz.cc
+++ b/decode_lz.cc
@@ -30,6 +30,12 @@
!defined __DragonFly__ && !defined __APPLE__ && !defined __OS2__
#include <sys/sysmacros.h> // for major, minor, makedev
#endif
+#if !defined(HAVE_MAJOR) && !defined(major)
+/* Replacement for major/minor/makedev. */
+#define major(x) ((int)(0x00ff & ((x) >> 8)))
+#define minor(x) ((int)(0xffff00ff & (x)))
+#define makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min)))
+#endif
#include <lzlib.h>

#include "tarlz.h"

0 comments on commit 8858b5e

Please sign in to comment.