Merge branch 'master' into x86_64
Conflicts: build/jam/FloppyBootImage build/jam/OptionalBuildFeatures build/jam/OptionalPackages headers/private/shared/cpu_type.h src/bin/ps.c src/bin/sysinfo.cpp src/kits/tracker/PoseView.cpp src/preferences/appearance/DecorSettingsView.cpp src/preferences/virtualmemory/Settings.cpp src/servers/input/AddOnManager.cpp src/servers/input/InputServer.cpp src/servers/input/InputServerMethod.cpp src/system/boot/Jamfile src/system/boot/platform/raspberrypi_arm/mmu.cpp src/system/boot/platform/u-boot/arch/arm/Jamfile src/system/kernel/arch/x86/arch_cpu.cpp src/system/kernel/arch/x86/arch_thread.cpp src/system/kernel/cache/block_cache.cpp src/system/kernel/vm/VMAnonymousCache.cpp
This commit is contained in:
@@ -220,7 +220,7 @@ extern int execle(const char *path, const char *arg , ... /*, char **envp */);
|
||||
extern int exect(const char *path, char *const *argv);
|
||||
extern int execvp(const char *file, char *const *argv);
|
||||
|
||||
extern void _exit(int status);
|
||||
extern void _exit(int status) __attribute__ ((noreturn));
|
||||
|
||||
extern pid_t tcgetpgrp(int fd);
|
||||
extern int tcsetpgrp(int fd, pid_t pgrpid);
|
||||
|
||||
@@ -30,7 +30,7 @@ typedef struct {
|
||||
void* converter;
|
||||
char charset[64];
|
||||
unsigned int count;
|
||||
char data[1024 + 8]; // 1024 bytes for data, 8 for alignment space
|
||||
char data[1024 + 8]; /* 1024 bytes for data, 8 for alignment space */
|
||||
} mbstate_t;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user