i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'scheduler'

Browse Source 
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:
Pawel Dziepak
2014-01-17 04:06:15 +01:00
parent dd8a866adc 0269dd284e
commit d0f2d8282f
356 changed files with 11797 additions and 9927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/fs_shell/fssh_api_wrapper.h
+1
View File
@@ -50,6 +50,7 @@
// #pragma mark - fssh_atomic.h
#define atomic_set fssh_atomic_set
#define atomic_get_and_Set fssh_atomic_get_and_set
#define atomic_test_and_set fssh_atomic_test_and_set
#define atomic_add fssh_atomic_add
#define atomic_and fssh_atomic_and