[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109296: Empty src/s/netbsd.h and rem
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109296: Empty src/s/netbsd.h and remove the file |
Date: |
Mon, 30 Jul 2012 07:46:48 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109296
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 07:46:48 -0700
message:
Empty src/s/netbsd.h and remove the file
* 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.
removed:
src/s/netbsd.h
modified:
ChangeLog
configure.ac
src/ChangeLog
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-30 14:30:20 +0000
+++ b/ChangeLog 2012-07-30 14:46:48 +0000
@@ -1,5 +1,9 @@
2012-07-30 Glenn Morris <address@hidden>
+ * 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 <address@hidden>
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-30 14:30:20 +0000
+++ b/configure.ac 2012-07-30 14:46:48 +0000
@@ -3641,12 +3641,19 @@
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 <address@hidden> 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 @@
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 @@
#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 @@
# 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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-30 14:30:20 +0000
+++ b/src/ChangeLog 2012-07-30 14:46:48 +0000
@@ -1,5 +1,8 @@
2012-07-30 Glenn Morris <address@hidden>
+ * 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.
=== removed file 'src/s/netbsd.h'
--- a/src/s/netbsd.h 2012-07-14 00:04:10 +0000
+++ b/src/s/netbsd.h 1970-01-01 00:00:00 +0000
@@ -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 <address@hidden> 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>
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109296: Empty src/s/netbsd.h and remove the file,
Glenn Morris <=