Re: CVS commit: src/sys/external/bsd/acpica/dist

["Herbert J. Skuhra" <herbert%gojira.at@localhost>]

On Sun, 02 Aug 2020 22:25:55 +0200, "Christos Zoulas" wrote:
> 
> Module Name:	src
> Committed By:	christos
> Date:		Sun Aug  2 20:25:55 UTC 2020
> 
> Modified Files:
> 	src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslerror.c
> 	    aslload.c aslxref.c
> 	src/sys/external/bsd/acpica/dist/debugger: dbdisply.c
> 	src/sys/external/bsd/acpica/dist/include: acpixf.h actypes.h
> 	src/sys/external/bsd/acpica/dist/os_specific/service_layers:
> 	    oslinuxtbl.c
> 	src/sys/external/bsd/acpica/dist/utilities: utdecode.c utdelete.c
> Removed Files:
> 	src/sys/external/bsd/acpica/dist/generate/unix/acpinames: Makefile
> 	src/sys/external/bsd/acpica/dist/tools/acpinames: acpinames.h anmain.c
> 	    anstubs.c antables.c
> 
> Log Message:
> merge conflicts

This breaks the build (amd64) on FreeBSD and GNU/Linux:

aslcompilerlex.l: In function 'AslCompilerlex':
aslcompilerlex.l:589:22: error: 'PARSEOP_REGIONSPACE_PRM' undeclared (first use in this function); did you mean 'PARSEOP_REGIONSPACE_PCC'?
 "FFixedHW"                  { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
                      ^~~~~~~~~~~~~~~~~~~~~~~
                      PARSEOP_REGIONSPACE_PCC
aslcompilerlex.l:589:22: note: each undeclared identifier is reported only once for each function it appears in
*** [aslcompilerlex.o] Error code 1

--
Herbert