Move _longjmp, _setjmp from src/s to configure

* configure.ac (_longjmp, _setjmp): Move here from src/s.

* src/s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them.
* src/s/irix6-5.h (_longjmp, _setjmp): No more need to undefine.

5 files changed, 18 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ee3ae610a35..5c1f2c6a1b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (_longjmp, _setjmp): Move here from src/s.
+
 2012-07-30  Jan Djärv  <jan.h.d@swipnet.se>
 
         * Makefile.in (install-arch-indep): Remove sh -x.
diff --git a/configure.ac b/configure.ac
index 9b8cabf8e4a..9ca02cce7cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3631,6 +3631,15 @@ else
   esac
 fi                              dnl GCC?
 
+case $opsys in
+  sol2* | unixware )
+    dnl setjmp and longjmp can safely replace _setjmp and _longjmp,
+    dnl but they will run more slowly.
+    AC_DEFINE(_setjmp, setjmp, [Some platforms redefine this.])
+    AC_DEFINE(_longjmp, longjmp, [Some platforms redefine this.])
+    ;;
+esac
+
 
 dnl Used in xfaces.c.
 case $opsys in
diff --git a/src/ChangeLog b/src/ChangeLog
index e8aff22c2cb..37d660da785 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+        * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them.
+        * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine.
+
 2012-07-30  Andreas Schwab  <schwab@linux-m68k.org>
 
         * keymap.c (Fkey_description): Don't remove 0x80 bit from
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 9b215845461..1750183189d 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -19,9 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "usg5-4-common.h"
 
-#undef _longjmp /* use system versions, not conservative aliases */
-#undef _setjmp
-
 #ifdef emacs
 char *_getpty();
 #endif
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 6ead01d3712..12506bd8d08 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -20,11 +20,6 @@ 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/>.  */
 
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
-   but they will run slower.  */
-#define _setjmp setjmp
-#define _longjmp longjmp
-
 /* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
    But get <termio.h> first to make sure ttold.h doesn't interfere.  */
 #include <sys/wait.h>