comparison src/s/aix4-2.h @ 5495:1f0b15040456

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 861f2601a38b 2aa9cd456ae7
children
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
2 * Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc. 2 * Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
3 * Copyright (C) 2010 Ben Wing. 3 * Copyright (C) 2010 Ben Wing.
4 * 4 *
5 * This file is part of XEmacs. 5 * This file is part of XEmacs.
6 * 6 *
7 * XEmacs is free software; you can redistribute it and/or modify 7 * XEmacs is free software: you can redistribute it and/or modify it
8 * it under the terms of the GNU General Public License as published by 8 * under the terms of the GNU General Public License as published by the
9 * the Free Software Foundation; either version 2, or (at your option) 9 * Free Software Foundation, either version 3 of the License, or (at your
10 * any later version. 10 * option) any later version.
11 * 11 *
12 * XEmacs is distributed in the hope that it will be useful, 12 * XEmacs is distributed in the hope that it will be useful, but WITHOUT
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 * GNU General Public License for more details. 15 * for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with XEmacs; see the file COPYING. If not, write to 18 * along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
19 * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20 * Boston, MA 02111-1307, USA. */
21 19
22 /* Synched up with: FSF 19.31. */ 20 /* Synched up with: FSF 19.31. */
23 21
24 /* 22 /*
25 * Define symbols to identify the version of Unix this is. 23 * Define symbols to identify the version of Unix this is.