40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
SIZE_WIDTH is already defined stdint.h
|
|
|
|
--- src/mkimage.cc.orig 2005-07-09 21:14:46.000000000 +0200
|
|
+++ src/mkimage.cc 2018-01-15 19:36:50.781708093 +0100
|
|
@@ -285,27 +285,27 @@
|
|
//______________________________________________________________________
|
|
|
|
namespace {
|
|
- const int SIZE_WIDTH = 12;
|
|
+ const int SIZE__WIDTH = 12;
|
|
}
|
|
|
|
ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
|
|
- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
|
|
+ s << "image-info " << setw(SIZE__WIDTH) << size() << " "
|
|
<< md5() << ' ' << blockLength() << '\n';
|
|
return s;
|
|
}
|
|
ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
|
|
- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
|
|
- << setw(SIZE_WIDTH) << size() << '\n';
|
|
+ s << "in-template " << setw(SIZE__WIDTH) << offset() << ' '
|
|
+ << setw(SIZE__WIDTH) << size() << '\n';
|
|
return s;
|
|
}
|
|
ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
|
|
- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
|
|
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
|
+ s << "need-file " << setw(SIZE__WIDTH) << offset() << ' '
|
|
+ << setw(SIZE__WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
|
return s;
|
|
}
|
|
ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
|
|
- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
|
|
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
|
+ s << "have-file " << setw(SIZE__WIDTH) << offset() << ' '
|
|
+ << setw(SIZE__WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
|
return s;
|
|
}
|
|
|