Merge branch 'scheduler'
Conflicts: build/jam/packages/Haiku headers/os/kernel/OS.h headers/os/opengl/GLRenderer.h headers/private/shared/cpu_type.h src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.h src/bin/sysinfo.cpp src/bin/top.c src/system/kernel/arch/x86/arch_system_info.cpp src/system/kernel/port.cpp
This commit is contained in:
@@ -50,12 +50,12 @@ typedef struct _pthread_rwlockattr {
|
||||
typedef void (*pthread_key_destructor)(void *data);
|
||||
|
||||
struct pthread_key {
|
||||
vint32 sequence;
|
||||
int32 sequence;
|
||||
pthread_key_destructor destructor;
|
||||
};
|
||||
|
||||
struct pthread_key_data {
|
||||
vint32 sequence;
|
||||
int32 sequence;
|
||||
void *value;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user