diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2024-02-12 01:26:33 -0500 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-02-12 18:50:00 +0100 |
| commit | df9270ef134498d4fffb921286375137d3639ae5 (patch) | |
| tree | 1eb4ddb572f24fbc737a99c4c63d39fe6d2b3653 /include | |
| parent | 2556fdece900d67529d5eda01f1bdaae4ffe96b0 (diff) | |
| download | gnumach-df9270ef134498d4fffb921286375137d3639ae5.tar.gz gnumach-df9270ef134498d4fffb921286375137d3639ae5.tar.bz2 gnumach-df9270ef134498d4fffb921286375137d3639ae5.zip | |
Replace kernel header includes in include/mach/mach_types.h with forward declarations.
I was trying to reuse TASK_NAME_SIZE in kern/thread.h but it was
impossible because files included from kern/task.h end up requiring
kern/thread.h (through percpu.h), creating a recursive dependency.
With this change, mach_types.h only defines forward declarations and
modules have to explicitly include the appropriate header file if they
want to be able touch those structures. Most of the other includes are
required because we no longer grab many different includes through
mach_types.h.
Message-ID: <20240212062634.1082207-1-flaviocruz@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/mach/mach_types.h | 13 | ||||
| -rw-r--r-- | include/mach/std_types.h | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/include/mach/mach_types.h b/include/mach/mach_types.h index 57f8f22d..5ecd686a 100644 --- a/include/mach/mach_types.h +++ b/include/mach/mach_types.h @@ -57,13 +57,12 @@ #include <mach/vm_sync.h> #ifdef MACH_KERNEL -#include <kern/task.h> /* for task_array_t */ -#include <kern/thread.h> /* for thread_array_t */ -#include <kern/processor.h> /* for processor_array_t, - processor_set_array_t, - processor_set_name_array_t */ -#include <kern/syscall_emulation.h> - /* for emulation_vector_t */ + +typedef struct task *task_t; +typedef struct thread *thread_t; +typedef struct processor *processor_t; +typedef struct processor_set *processor_set_t; + #else /* MACH_KERNEL */ typedef mach_port_t task_t; typedef task_t *task_array_t; diff --git a/include/mach/std_types.h b/include/mach/std_types.h index f78e236a..0d5db0ae 100644 --- a/include/mach/std_types.h +++ b/include/mach/std_types.h @@ -41,8 +41,4 @@ typedef vm_offset_t pointer_t; typedef vm_offset_t vm_address_t; -#ifdef MACH_KERNEL -#include <ipc/ipc_port.h> -#endif /* MACH_KERNEL */ - #endif /* _MACH_STD_TYPES_H_ */ |