diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/profiler.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/profiler.c')
| -rw-r--r-- | src/profiler.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/profiler.c b/src/profiler.c index 919aabc92af..1b49afe0331 100644 --- a/src/profiler.c +++ b/src/profiler.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Profiler implementation. | 1 | /* Profiler implementation. |
| 2 | 2 | ||
| 3 | Copyright (C) 2012-2014 Free Software Foundation, Inc. | 3 | Copyright (C) 2012-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -35,7 +35,6 @@ saturated_add (EMACS_INT a, EMACS_INT b) | |||
| 35 | 35 | ||
| 36 | typedef struct Lisp_Hash_Table log_t; | 36 | typedef struct Lisp_Hash_Table log_t; |
| 37 | 37 | ||
| 38 | static Lisp_Object Qprofiler_backtrace_equal; | ||
| 39 | static struct hash_table_test hashtest_profiler; | 38 | static struct hash_table_test hashtest_profiler; |
| 40 | 39 | ||
| 41 | static Lisp_Object | 40 | static Lisp_Object |