procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Empty src/s/netbsd.h and remove the file

Browse source 
* configure.ac (SIGNAL_H_AHB): New hack macro.
(opsysfile): Set to empty on netbsd, openbsd.
(AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined.

* src/s/netbsd.h: Let configure include signal.h if needed.
Remove file, which is now empty.
This commit is contained in:
Glenn Morris 2012-07-30 07:46:48 -07:00
parent 0a763bd17b
commit 32bac6d6e8
4 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2012-07-30 Glenn Morris <rgm@gnu.org>
* configure.ac (SIGNAL_H_AHB): New hack macro.
(opsysfile): Set to empty on netbsd, openbsd.
(AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined.
* configure.ac (_longjmp, _setjmp): Move here from src/s.
2012-07-30 Jan Djärv <jan.h.d@swipnet.se>

17
configure.ac
View file

@ -3641,12 +3641,19 @@ case $opsys in
esac
dnl Used in xfaces.c.
case $opsys in
hpux* | sol2* )
dnl Used in xfaces.c.
AC_DEFINE(XOS_NEEDS_TIME_H, 1, [Compensate for a bug in Xos.h on
some systems, where it requires time.h.])
;;
netbsd | openbsd )
dnl Greg A. Woods <woods@weird.com> says we must include signal.h
dnl before syssignal.h is included, to work around interface conflicts
dnl that are handled with CPP __RENAME() macro in signal.h.
AC_DEFINE(SIGNAL_H_AHB, 1, [Define if AH_BOTTOM should include signal.h.])
;;
esac
@ -3772,7 +3779,7 @@ case $opsys in
should not call setpgrp.])
;;
openbsd) opsysfile="s/netbsd.h" ;;
netbsd | openbsd ) opsysfile= ;;
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
@ -4186,6 +4193,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_CONFIG_H
])dnl
dnl FIXME undefs in here get commented out by autoconf. :(
AH_BOTTOM([
/* On AIX 3 this must be included before any other include file. */
#include <alloca.h>
@ -4193,6 +4201,11 @@ AH_BOTTOM([
# error "alloca not available on this machine"
#endif
#ifdef SIGNAL_H_AHB
#undef SIGNAL_H_AHB
#include <signal.h>
#endif
/* This silences a few compilation warnings on FreeBSD. */
#ifdef BSD_SYSTEM_AHB
#undef BSD_SYSTEM_AHB

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-07-30 Glenn Morris <rgm@gnu.org>
* s/netbsd.h: Let configure include signal.h if needed.
Remove file, which is now empty.
* s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them.
* s/irix6-5.h (_longjmp, _setjmp): No more need to undefine.

24
src/s/netbsd.h
View file

@ -1,24 +0,0 @@
/* s/ file for netbsd system.
Copyright (C) 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 <http://www.gnu.org/licenses/>. */
/* Greg A. Woods <woods@weird.com> says we must include signal.h
before syssignal.h is included, to work around interface conflicts
that are handled with CPP __RENAME() macro in signal.h. */
#include <signal.h>