diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/w32heap.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/w32heap.c')
| -rw-r--r-- | src/w32heap.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/w32heap.c b/src/w32heap.c index 285325e3f8b..39ff1017466 100644 --- a/src/w32heap.c +++ b/src/w32heap.c | |||
| @@ -21,10 +21,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | Geoff Voelker (voelker@cs.washington.edu) 7-29-94 | 21 | Geoff Voelker (voelker@cs.washington.edu) 7-29-94 |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #ifdef HAVE_CONFIG_H | ||
| 25 | #include <config.h> | 24 | #include <config.h> |
| 26 | #endif | ||
| 27 | |||
| 28 | #include <stdio.h> | 25 | #include <stdio.h> |
| 29 | #include <setjmp.h> | 26 | #include <setjmp.h> |
| 30 | 27 | ||
| @@ -301,5 +298,3 @@ _heap_term (void) | |||
| 301 | 298 | ||
| 302 | #endif | 299 | #endif |
| 303 | 300 | ||
| 304 | /* arch-tag: 9a6a9860-040d-422d-8905-450dd535cd9c | ||
| 305 | (do not change this comment) */ | ||