0b8e20c89e
- The primary reason is that mkfs and installboot need to run natively during the cross compilation (host and target versions are compiled). There is a collision of include files though. E.g. a.out.h is very minix-specific. Therefore some files we moved and replaced by stubs that include the original file if compiling on or for Minix : include/a.out.h -> include/minix/a.out.h include/sys/dir.h -> include/minix/dir.h include/dirent.h -> include/minix/dirent.h include/sys/types.h -> include/minix/types.h - This does not break any native compilation on Minix. Other headers that were including the original files are changed according to include directly the new, minix specific location not to pick up the host system includes while cross-compiling. - role of this patch is to make rebasing of the build branch simpler until the new build system is merged
12 lines
382 B
C
Executable file
12 lines
382 B
C
Executable file
/*
|
|
* this files resolves conflicts between the file of the host system and
|
|
* the minix specific one. This file is included directly only on Minix
|
|
* and it is an error to do so on any other system
|
|
*/
|
|
|
|
#if !defined(_MINIX) && !defined(__minix) && !defined(__ACK__)
|
|
#error "Including Minix specific file in program targeted for other system"
|
|
#else
|
|
#include <minix/dirent.h>
|
|
#endif
|