Hi Branden, I've rebased, and it was clean. No conflicts. Also, I didn't find any new cases that I should replace. The patches seem to be identical to v4 according to the range-diff (see below).
Have a lovely day! Alex Alejandro Colomar (4): bootstrap.conf: $gnulib_modules: Add stdcountof-h src/: Use countof() instead of array_length() [hpftodit]: Use countof() instead of SIZEOF() src/: Use countof() instead of sizeof division bootstrap.conf | 1 + src/devices/grolbp/lbp.cpp | 5 +++-- src/devices/grolj4/lj4.cpp | 5 +++-- src/devices/grops/ps.cpp | 3 ++- src/devices/grops/psrm.cpp | 11 ++++++----- src/include/lib.h | 8 -------- src/libs/libgroff/font.cpp | 6 +++--- src/libs/libgroff/glyphuni.cpp | 4 +++- src/libs/libgroff/make-uniuni | 4 +++- src/libs/libgroff/uniglyph.cpp | 6 +++--- src/libs/libgroff/uniuni.cpp | 4 +++- src/preproc/eqn/box.cpp | 14 ++++++++------ src/preproc/eqn/delim.cpp | 4 +++- src/preproc/eqn/lex.cpp | 11 ++++++----- src/preproc/eqn/text.cpp | 6 +++--- src/preproc/pic/lex.cpp | 3 ++- src/preproc/pic/pic.ypp | 7 ++++--- src/preproc/preconv/preconv.cpp | 5 +++-- src/preproc/refer/command.cpp | 5 +++-- src/preproc/refer/ref.cpp | 4 +++- src/roff/troff/input.cpp | 4 ++-- src/utils/addftinfo/addftinfo.cpp | 5 +++-- src/utils/hpftodit/hpftodit.cpp | 6 +++--- src/utils/hpftodit/hpuni.cpp | 6 +++--- src/utils/tfmtodit/tfmtodit.cpp | 7 ++++--- 25 files changed, 80 insertions(+), 64 deletions(-) Range-diff against v4: 1: 691ec51a5 = 1: 361ad1b44 bootstrap.conf: $gnulib_modules: Add stdcountof-h 2: 705cd87b0 = 2: 7348d3a1f src/: Use countof() instead of array_length() 3: f6f3d62d4 = 3: 5a1beff06 [hpftodit]: Use countof() instead of SIZEOF() 4: 47f06bf6f = 4: 49f759a68 src/: Use countof() instead of sizeof division -- 2.51.0
