Mercurial > emacs
comparison src/s/gnu-linux.h @ 112330:56d3e9c28eb0
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 11:01:01 -0800 |
parents | 61f7601898b1 |
children |
comparison
equal
deleted
inserted
replaced
112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
---|---|
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, 2002, 2003, 2004, | 3 Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, |
4 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. | 4 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
5 Free Software Foundation, Inc. | |
5 | 6 |
6 This file was put together by Michael K. Johnson and Rik Faith. | 7 This file was put together by Michael K. Johnson and Rik Faith. |
7 | 8 |
8 This file is part of GNU Emacs. | 9 This file is part of GNU Emacs. |
9 | 10 |
158 __builtin_ia64_bsp (), 0); \ | 159 __builtin_ia64_bsp (), 0); \ |
159 } while (0) | 160 } while (0) |
160 #endif | 161 #endif |
161 #endif | 162 #endif |
162 | 163 |
163 /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9 | |
164 (do not change this comment) */ |