diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-10-27 21:43:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-10-27 21:43:48 +0200 |
| commit | 2f246cd3c8959abeaad76a7cd442dd20d69fb1a0 (patch) | |
| tree | 9ac949798788d5513c1c436b67af7d26165929a4 /src | |
| parent | 2e612797ce51736ccdcd1076b3d0f36eb4c17182 (diff) | |
| download | emacs-2f246cd3c8959abeaad76a7cd442dd20d69fb1a0.tar.gz | |
Fix compiler warnings in w32proc.c.
src/w32proc.c (sys_spawnve): Avoid compiler warning about format mismatch.
(timer_loop): Remove unused variable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32proc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 398d19fe6f2..7f036761011 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -11,11 +11,13 @@ for the timer. (timer_loop): Enter critical section when accessing ULONGLONG values of the itimer_data struct, as these accesses are no longer - atomic. Call 'w32_get_timer_time' instead of 'clock'. + atomic. Call 'w32_get_timer_time' instead of 'clock'. Remove + unused variable. (init_timers): Initialize s_pfn_Get_Thread_Times. (start_timer_thread): Don't assign itimer->caller_thread here. (getitimer): Assign itimer->caller_thread here. (setitimer): Always call getitimer to get the value of ticks_now. + (sys_spawnve): Avoid compiler warning about format mismatch. 2012-10-26 Eli Zaretskii <eliz@gnu.org> diff --git a/src/w32proc.c b/src/w32proc.c index af656f915c7..e2187d52425 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -335,7 +335,6 @@ timer_loop (LPVOID arg) int sig = (which == ITIMER_REAL) ? SIGALRM : SIGPROF; CRITICAL_SECTION *crit = (which == ITIMER_REAL) ? &crit_real : &crit_prof; const DWORD max_sleep = MAX_SINGLE_SLEEP * 1000 / CLOCKS_PER_SEC; - int new_count = 0; HANDLE hth = (which == ITIMER_REAL) ? NULL : itimer->caller_thread; while (1) @@ -1656,7 +1655,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) numenv++; } /* extra env vars... */ - sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%d", + sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%lu", GetCurrentProcessId ()); arglen += strlen (ppid_env_var_buffer) + 1; numenv++; |