Merge branch 'master' into unstable

This commit is contained in:
antirez
2011-01-04 19:07:15 +01:00
23 changed files with 802 additions and 323 deletions

View File

@ -1441,7 +1441,7 @@ void createPidFile(void) {
/* Try to write the pid file in a best-effort way. */
FILE *fp = fopen(server.pidfile,"w");
if (fp) {
fprintf(fp,"%d\n",getpid());
fprintf(fp,"%d\n",(int)getpid());
fclose(fp);
}
}