From 227f5bd0b41ebec90ec61a2b8832c95cec20c5a9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 29 Jul 2012 23:34:22 -0700 Subject: [PATCH] Remove s/aix4-2.h * configure.ac (opsysfile): Set to empty on aix4-2. * src/s/aix4-2.h: Remove empty file. --- ChangeLog | 4 ++-- configure.ac | 1 + src/ChangeLog | 2 +- src/s/aix4-2.h | 18 ------------------ 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 src/s/aix4-2.h diff --git a/ChangeLog b/ChangeLog index b72f1d50fa0..e83265a747d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,8 +2,8 @@ * configure.ac (opsysfile): Tweak message for null case. - * configure.ac (opsysfile): Set to empty on freebsd, gnu-linux, - gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware. + * configure.ac (opsysfile): Set to empty on aix4-2, freebsd, + gnu-linux, gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware. 2012-07-30 Paul Eggert diff --git a/configure.ac b/configure.ac index 224ac182613..9b8cabf8e4a 100644 --- a/configure.ac +++ b/configure.ac @@ -3650,6 +3650,7 @@ AH_TEMPLATE(USG5, [Define if the system is compatible with System V.]) case $opsys in aix4-2) + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) dnl This symbol should be defined on AIX Version 3 ??????? diff --git a/src/ChangeLog b/src/ChangeLog index ac4aff4412b..78205746c4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ 2012-07-30 Glenn Morris * s/aix4-2.h (sigmask): No need to undefine it, since syssignal.h - does that unconditionally. + does that unconditionally. Remove file, which is now empty. * s/freebsd.h, s/gnu-linux.h, s/sol2-6.h, s/unixware.h: Remove empty files. diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h deleted file mode 100644 index 8a957e693eb..00000000000 --- a/src/s/aix4-2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -- 2.39.2