Merge branch 'master' into 'mlong/webv4unreadindex'

# Conflicts:
#   webv4/pages/000-mail.xjs
14 jobs for mlong/webv4unreadindex in 14 minutes and 58 seconds (queued for 6 seconds)
Status Name Job ID Coverage
  Build
failed jsdoor-freebsd #6863
FreeBSD

00:04:12

failed jsdoor-linux #6864
Linux

00:04:35

failed jsdoor-windows #6866
FreeBSD

00:02:03

passed sbbs-freebsd #6858
FreeBSD

00:06:25

passed sbbs-linux #6853
Linux

00:07:56

passed sbbs-windows #6856
Windows

00:06:53

passed sexpots-freebsd #6865
FreeBSD

00:00:15

passed sexpots-linux #6854
Linux

00:00:09

passed sexpots-windows #6857
Windows

00:00:49

passed syncdraw-freebsd #6861
FreeBSD

00:00:24

passed syncdraw-linux #6862
Linux

00:00:24

passed syncterm-freebsd #6859
FreeBSD

00:01:15

passed syncterm-linux #6855
Linux

00:01:50

passed syncterm-windows #6860
FreeBSD

00:02:25

 
Name Stage Failure
failed
jsdoor-windows Build
        ^
ver.cpp:29:8: error: expected identifier or '(' before string constant
extern "C" const char* git_branch = GIT_BRANCH;
^
ver.cpp:30:8: error: expected identifier or '(' before string constant
extern "C" const char* beta_version = " "; /* Space if non-beta, " beta" otherwise */
^
gmake: *** [/var/tmp/gitlab_runner/builds/TkL89aUh/5/main/sbbs/src/sbbs3/../build/Common.gmake:456: gcc.win32.amd64.obj.release-mt/jsdoor.o] Error 1
ERROR: Job failed: exit status 1
failed
jsdoor-linux Build
        ^~~
ver.cpp:29:8: error: expected identifier or ‘(’ before string constant
extern "C" const char* git_branch = GIT_BRANCH;
^~~
ver.cpp:30:8: error: expected identifier or ‘(’ before string constant
extern "C" const char* beta_version = " "; /* Space if non-beta, " beta" otherwise */
^~~
make: *** [/home/gitlab-runner/builds/DNxWpMa6/0/main/sbbs/src/sbbs3/../build/Common.gmake:456: gcc.linux.x64.obj.release-mt/jsdoor.o] Error 1
ERROR: Job failed: exit status 1
failed
jsdoor-freebsd Build
#define R2(n)  R(n),   R((n) + (1 << 0)),    R((n) + (2 << 0)),    R((n) + (3 << 0))
^~~~~~~~~~~~~~~~~
jsstr.cpp:3210:7: note: expanded from macro 'R'
{ (jschar *)(((char *)(length2StringTable + (c))) + \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
jsstr.cpp:3224:5: warning: cast from 'char *' to 'jschar *' (aka 'unsigned short *') increases required alignment from 1 to 2 [-Wcast-align]
= { R12(0) };
^~~~~~
jsstr.cpp:3136:24: note: expanded fr
Job's log exceeded limit of 4194304 bytes.