diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/s/gnu-linux.h | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 3d78bf695bc..b54bd985e6b 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* This file is the configuration file for Linux-based GNU systems | 1 | /* This file is the configuration file for Linux-based GNU systems |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2011 | 3 | Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file was put together by Michael K. Johnson and Rik Faith. | 6 | This file was put together by Michael K. Johnson and Rik Faith. |
| @@ -155,7 +155,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 155 | extern void *__libc_ia64_register_backing_store_base; \ | 155 | extern void *__libc_ia64_register_backing_store_base; \ |
| 156 | __builtin_ia64_flushrs (); \ | 156 | __builtin_ia64_flushrs (); \ |
| 157 | mark_memory (__libc_ia64_register_backing_store_base, \ | 157 | mark_memory (__libc_ia64_register_backing_store_base, \ |
| 158 | __builtin_ia64_bsp (), 0); \ | 158 | __builtin_ia64_bsp ()); \ |
| 159 | } while (0) | 159 | } while (0) |
| 160 | #endif | 160 | #endif |
| 161 | #endif | 161 | #endif |