merge from 5.1

This commit is contained in:
Bjorn Munch 2010-09-29 12:56:10 +02:00
commit dae793978a
251 changed files with 3535 additions and 2437 deletions

View file

@ -159,7 +159,7 @@ int main(int argc, char* const argv[] )
signal(SIGCHLD, handle_signal);
signal(SIGABRT, handle_abort);
sprintf(safe_process_name, "safe_process[%d]", own_pid);
sprintf(safe_process_name, "safe_process[%ld]", (long) own_pid);
message("Started");