From 7c045aad764741edb00df52f38e86d2a8013aa03 Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 15 Mar 2019 18:18:05 +0000 Subject: [PATCH] Deanonymize thread and proc state enums, so that a userland app can use them without redefining the value names. New clang no longer allows to redefine a enum value name to the same value. Bump __FreeBSD_version, since ports depend on that. Discussed with: jhb --- sys/sys/param.h | 2 +- sys/sys/proc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 62cc482a95e..b9f1fe5e63d 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300014 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300015 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 7e67ec48e0a..b2f75f921ec 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -326,7 +326,7 @@ struct thread { * or already have been set in the allocator, constructor, etc. */ struct pcb *td_pcb; /* (k) Kernel VA of pcb and kstack. */ - enum { + enum td_states { TDS_INACTIVE = 0x0, TDS_INHIBITED, TDS_CAN_RUN, @@ -573,7 +573,7 @@ struct proc { int p_flag; /* (c) P_* flags. */ int p_flag2; /* (c) P2_* flags. */ - enum { + enum p_states { PRS_NEW = 0, /* In creation */ PRS_NORMAL, /* threads can be run. */ PRS_ZOMBIE -- 2.45.0