Cleanup bad merge (WTF?)

14 jobs for master in 7 minutes and 40 seconds (queued for 12 seconds)
Status Job ID Name Coverage
  Build
failed #30558
FreeBSD
jsdoor-freebsd

00:03:36

failed #30559
Linux
jsdoor-linux

00:07:11

failed #30561
FreeBSD
jsdoor-windows

00:01:23

failed #30553
FreeBSD
sbbs-freebsd

00:03:28

failed #30548
Linux
sbbs-linux

00:07:07

failed #30551
Windows
sbbs-windows

00:02:34

passed #30560
FreeBSD
sexpots-freebsd

00:00:11

passed #30549
Linux
sexpots-linux

00:00:22

passed #30552
Windows
sexpots-windows

00:00:33

passed #30556
FreeBSD
syncdraw-freebsd

00:00:24

passed #30557
Linux
syncdraw-linux

00:00:59

failed #30554
FreeBSD
syncterm-freebsd

00:00:13

failed #30550
Linux
syncterm-linux

00:00:42

failed #30555
FreeBSD
syncterm-windows

00:00:23

 
Name Stage Failure
failed
jsdoor-linux Build
uifc32.c:90:13: note: previous declaration of ‘showbuf’ was here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^~~~~~~
uifc32.c:90:13: warning: ‘showbuf’ used but never defined
make[1]: *** [../build/Common.gmake:462: gcc.linux.x64.obj.release-mt/uifc32.o] Error 1
make[1]: Leaving directory '/home/gitlab-runner/builds/vLEE6HYB/1/main/sbbs/src/uifc'
make: *** [/home/gitlab-runner/builds/vLEE6HYB/1/main/sbbs/src/sbbs3/../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
sbbs-linux Build
     ^~~~~~~~~~~~~~~~~
In file included from sbbs.h:291,
from atcodes.cpp:22:
str_util.h:70:18: note: previous declaration ‘char* utf8_to_cp437_str(char*)’
DLLEXPORT char * utf8_to_cp437_str(char* str);
^~~~~~~~~~~~~~~~~
make: *** [/home/gitlab-runner/builds/vLEE6HYB/2/main/sbbs/src/sbbs3/../build/Common.gmake:467: gcc.linux.x64.obj.release-mt/atcodes.o] Error 1
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
jsdoor-freebsd Build
uifc32.c:90:13: note: previous declaration is here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^
1 error generated.
gmake[1]: *** [../build/Common.gmake:462: clang.freebsd.amd64.obj.release-mt/uifc32.o] Error 1
gmake[1]: Leaving directory '/var/tmp/gitlab_runner/builds/TkL89aUh/5/main/sbbs/src/uifc'
gmake: *** [/var/tmp/gitlab_runner/builds/TkL89aUh/5/main/sbbs/src/sbbs3/../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
sbbs-freebsd Build
int utf8_to_cp437_str(const char *src, char *dest, size_t maxlen, unsigned char minval, size_t *outlen);
~~~ ^
./str_util.h:70:18: note: previous declaration is here
DLLEXPORT char * utf8_to_cp437_str(char* str);
~~~~~~ ^
1 error generated.
gmake: *** [/var/tmp/gitlab_runner/builds/TkL89aUh/2/main/sbbs/src/sbbs3/../build/Common.gmake:467: clang.freebsd.amd64.obj.release-mt/atcodes.o] Error 1
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
sbbs-windows Build

77 Warning(s)
15 Error(s)

Time Elapsed 00:02:06.49

!ERROR(s) occurred
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
jsdoor-windows Build
uifc32.c:90:13: note: previous declaration of 'showbuf' was here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^
uifc32.c:90:13: warning: 'showbuf' used but never defined [enabled by default]
gmake[1]: *** [../build/Common.gmake:462: gcc.win32.amd64.obj.release-mt/uifc32.o] Error 1
gmake[1]: Leaving directory '/var/tmp/gitlab_runner/builds/TkL89aUh/0/main/sbbs/src/uifc'
gmake: *** [/var/tmp/gitlab_runner/builds/TkL89aUh/0/main/sbbs/src/sbbs3/../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
syncterm-linux Build
uifc32.c:90:13: note: previous declaration of ‘showbuf’ was here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^~~~~~~
uifc32.c:90:13: warning: ‘showbuf’ used but never defined
make[1]: *** [../build/Common.gmake:462: gcc.linux.x64.obj.release-mt/uifc32.o] Error 1
make[1]: Leaving directory '/home/gitlab-runner/builds/vLEE6HYB/3/main/sbbs/src/uifc'
make: *** [../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
syncterm-windows Build
uifc32.c:90:13: note: previous declaration of 'showbuf' was here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^
uifc32.c:90:13: warning: 'showbuf' used but never defined [enabled by default]
gmake[1]: *** [../build/Common.gmake:462: gcc.win32.amd64.obj.release-mt/uifc32.o] Error 1
gmake[1]: Leaving directory '/var/tmp/gitlab_runner/builds/TkL89aUh/4/main/sbbs/src/uifc'
gmake: *** [../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1
failed
syncterm-freebsd Build
uifc32.c:90:13: note: previous declaration is here
static void showbuf(int mode, int left, int top, int width, int height, const char *title
^
1 error generated.
gmake[1]: *** [../build/Common.gmake:462: clang.freebsd.amd64.obj.release-mt/uifc32.o] Error 1
gmake[1]: Leaving directory '/var/tmp/gitlab_runner/builds/TkL89aUh/3/main/sbbs/src/uifc'
gmake: *** [../build/Common.gmake:517: uifc-mt] Error 2
Cleaning up file based variables
ERROR: Job failed: exit status 1