diff options
| author | Eli Zaretskii | 2012-10-27 21:43:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-27 21:43:48 +0200 |
| commit | 2f246cd3c8959abeaad76a7cd442dd20d69fb1a0 (patch) | |
| tree | 9ac949798788d5513c1c436b67af7d26165929a4 /src | |
| parent | 2e612797ce51736ccdcd1076b3d0f36eb4c17182 (diff) | |
| download | emacs-2f246cd3c8959abeaad76a7cd442dd20d69fb1a0.tar.gz emacs-2f246cd3c8959abeaad76a7cd442dd20d69fb1a0.zip | |
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 @@ | |||
| 11 | for the timer. | 11 | for the timer. |
| 12 | (timer_loop): Enter critical section when accessing ULONGLONG | 12 | (timer_loop): Enter critical section when accessing ULONGLONG |
| 13 | values of the itimer_data struct, as these accesses are no longer | 13 | values of the itimer_data struct, as these accesses are no longer |
| 14 | atomic. Call 'w32_get_timer_time' instead of 'clock'. | 14 | atomic. Call 'w32_get_timer_time' instead of 'clock'. Remove |
| 15 | unused variable. | ||
| 15 | (init_timers): Initialize s_pfn_Get_Thread_Times. | 16 | (init_timers): Initialize s_pfn_Get_Thread_Times. |
| 16 | (start_timer_thread): Don't assign itimer->caller_thread here. | 17 | (start_timer_thread): Don't assign itimer->caller_thread here. |
| 17 | (getitimer): Assign itimer->caller_thread here. | 18 | (getitimer): Assign itimer->caller_thread here. |
| 18 | (setitimer): Always call getitimer to get the value of ticks_now. | 19 | (setitimer): Always call getitimer to get the value of ticks_now. |
| 20 | (sys_spawnve): Avoid compiler warning about format mismatch. | ||
| 19 | 21 | ||
| 20 | 2012-10-26 Eli Zaretskii <eliz@gnu.org> | 22 | 2012-10-26 Eli Zaretskii <eliz@gnu.org> |
| 21 | 23 | ||
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) | |||
| 335 | int sig = (which == ITIMER_REAL) ? SIGALRM : SIGPROF; | 335 | int sig = (which == ITIMER_REAL) ? SIGALRM : SIGPROF; |
| 336 | CRITICAL_SECTION *crit = (which == ITIMER_REAL) ? &crit_real : &crit_prof; | 336 | CRITICAL_SECTION *crit = (which == ITIMER_REAL) ? &crit_real : &crit_prof; |
| 337 | const DWORD max_sleep = MAX_SINGLE_SLEEP * 1000 / CLOCKS_PER_SEC; | 337 | const DWORD max_sleep = MAX_SINGLE_SLEEP * 1000 / CLOCKS_PER_SEC; |
| 338 | int new_count = 0; | ||
| 339 | HANDLE hth = (which == ITIMER_REAL) ? NULL : itimer->caller_thread; | 338 | HANDLE hth = (which == ITIMER_REAL) ? NULL : itimer->caller_thread; |
| 340 | 339 | ||
| 341 | while (1) | 340 | while (1) |
| @@ -1656,7 +1655,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) | |||
| 1656 | numenv++; | 1655 | numenv++; |
| 1657 | } | 1656 | } |
| 1658 | /* extra env vars... */ | 1657 | /* extra env vars... */ |
| 1659 | sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%d", | 1658 | sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%lu", |
| 1660 | GetCurrentProcessId ()); | 1659 | GetCurrentProcessId ()); |
| 1661 | arglen += strlen (ppid_env_var_buffer) + 1; | 1660 | arglen += strlen (ppid_env_var_buffer) + 1; |
| 1662 | numenv++; | 1661 | numenv++; |