extract.h/EFVisit.h include database.h for TileTypeBitMask

This has a knock on effect of causing EFvisit.c to require database.h
to be defined BEFORE the EFint.h due to an identical copy of ArrayInfo
type being present in both files.

Maybe there should be database_arrayinfo.h ?  To remove the copy.
This commit is contained in:
Darryl L. Miles 2025-02-17 09:41:50 +00:00 committed by Tim Edwards
parent 144c22f579
commit e8d7888300
2 changed files with 3 additions and 1 deletions

View File

@ -33,7 +33,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/malloc.h"
#include "utils/utils.h"
#include "extflat/extflat.h"
#include "extflat/EFint.h"
#include "database/database.h" /* before EFint.h for ArrayInfo */
#include "extflat/EFint.h" /* also has ArrayInfo */
#include "tiles/tile.h"
#include "extract/extract.h"

View File

@ -23,6 +23,7 @@
#define _EXTRACT_H
#include "utils/magic.h"
#include "database/database.h" /* TileTypeBitMask */
/* Extractor warnings */
#define EXTWARN_DUP 0x01 /* Warn if two nodes have the same name */