diff options
| author | Kenichi Handa | 2010-05-19 10:10:29 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-19 10:10:29 +0900 |
| commit | 134d1bcded02e066727ece838f14ffc767f76419 (patch) | |
| tree | 2187c2ac9748400146394bdaefd59f314598685d /src/s/gnu.h | |
| parent | 2833d9158d6315b59415173df5d47515faac5310 (diff) | |
| parent | 1fc0ce04bc651fe8adbe822515e4ea7a4e904249 (diff) | |
| download | emacs-134d1bcded02e066727ece838f14ffc767f76419.tar.gz emacs-134d1bcded02e066727ece838f14ffc767f76419.zip | |
merge trunk
Diffstat (limited to 'src/s/gnu.h')
| -rw-r--r-- | src/s/gnu.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/s/gnu.h b/src/s/gnu.h index 9f6fe52a5de..cb4c4a9d807 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Definitions file for GNU Emacs running on the GNU Hurd. | 1 | /* Definitions file for GNU Emacs running on the GNU Hurd. |
| 2 | Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, | 2 | |
| 3 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -28,11 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | 29 | ||
| 29 | #define SIGNALS_VIA_CHARACTERS | 30 | #define SIGNALS_VIA_CHARACTERS |
| 30 | 31 | ||
| 31 | /* Use mmap directly for allocating larger buffers. */ | ||
| 32 | #ifdef DOUG_LEA_MALLOC | ||
| 33 | #undef REL_ALLOC | ||
| 34 | #endif | ||
| 35 | |||
| 36 | /* GNU needs its own crt0, and libc defines data_start. */ | 32 | /* GNU needs its own crt0, and libc defines data_start. */ |
| 37 | #define ORDINARY_LINK | 33 | #define ORDINARY_LINK |
| 38 | #define DATA_START ({ extern int data_start; (char *) &data_start; }) | 34 | #define DATA_START ({ extern int data_start; (char *) &data_start; }) |