[Emacs-diffs] /srv/bzr/emacs/trunk r109295: Move _longjmp, _setjmp from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109295
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 07:30:20 -0700
message:
  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.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/irix6-5.h
  src/s/usg5-4-common.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-30 07:51:29 +0000
+++ b/ChangeLog 2012-07-30 14:30:20 +0000
@@ -1,3 +1,7 @@
+2012-07-30  Glenn Morris  <address@hidden>
+
+       * configure.ac (_longjmp, _setjmp): Move here from src/s.
+
 2012-07-30  Jan Djärv  <address@hidden>
 
        * Makefile.in (install-arch-indep): Remove sh -x.

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-30 06:34:22 +0000
+++ b/configure.ac      2012-07-30 14:30:20 +0000
@@ -3631,6 +3631,15 @@
   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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-30 07:45:58 +0000
+++ b/src/ChangeLog     2012-07-30 14:30:20 +0000
@@ -1,3 +1,8 @@
+2012-07-30  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keymap.c (Fkey_description): Don't remove 0x80 bit from

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-07-14 00:04:10 +0000
+++ b/src/s/irix6-5.h   2012-07-30 14:30:20 +0000
@@ -19,9 +19,6 @@
 
 #include "usg5-4-common.h"
 
-#undef _longjmp /* use system versions, not conservative aliases */
-#undef _setjmp
-
 #ifdef emacs
 char *_getpty();
 #endif

=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-07-13 21:45:55 +0000
+++ b/src/s/usg5-4-common.h     2012-07-30 14:30:20 +0000
@@ -20,11 +20,6 @@
 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>