diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/profiler.c | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/profiler.c')
| -rw-r--r-- | src/profiler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/profiler.c b/src/profiler.c index c86fb47d21d..64eb5cafc25 100644 --- a/src/profiler.c +++ b/src/profiler.c | |||
| @@ -267,8 +267,8 @@ setup_cpu_timer (Lisp_Object sampling_interval) | |||
| 267 | return NOT_RUNNING; | 267 | return NOT_RUNNING; |
| 268 | 268 | ||
| 269 | current_sampling_interval = XINT (sampling_interval); | 269 | current_sampling_interval = XINT (sampling_interval); |
| 270 | interval = make_emacs_time (current_sampling_interval / billion, | 270 | interval = make_timespec (current_sampling_interval / billion, |
| 271 | current_sampling_interval % billion); | 271 | current_sampling_interval % billion); |
| 272 | emacs_sigaction_init (&action, deliver_profiler_signal); | 272 | emacs_sigaction_init (&action, deliver_profiler_signal); |
| 273 | sigaction (SIGPROF, &action, 0); | 273 | sigaction (SIGPROF, &action, 0); |
| 274 | 274 | ||