diff options
| author | Glenn Morris | 2012-09-04 06:17:39 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-09-04 06:17:39 -0400 |
| commit | 6ec9a5a7b5efb129807f567709ca858211ed7840 (patch) | |
| tree | 51ba28626a1b29b013d4c6a2029940984e077c4d | |
| parent | af26b72c1187a93cdacc6abb6561f3c331346cef (diff) | |
| download | emacs-6ec9a5a7b5efb129807f567709ca858211ed7840.tar.gz emacs-6ec9a5a7b5efb129807f567709ca858211ed7840.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/config.in | 6 | ||||
| -rwxr-xr-x | autogen/configure | 36 |
2 files changed, 38 insertions, 4 deletions
diff --git a/autogen/config.in b/autogen/config.in index c39453938be..59bc8dca231 100644 --- a/autogen/config.in +++ b/autogen/config.in | |||
| @@ -1542,10 +1542,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1542 | declarations. Define as empty for no equivalent. */ | 1542 | declarations. Define as empty for no equivalent. */ |
| 1543 | #undef __restrict_arr | 1543 | #undef __restrict_arr |
| 1544 | 1544 | ||
| 1545 | /* Some platforms redefine this. */ | 1545 | /* Define to longjmp if _setjmp and _longjmp do not work. Because longjmp may |
| 1546 | alter signal masks, callers of _longjmp should not assume that it leaves | ||
| 1547 | signal masks alone. */ | ||
| 1546 | #undef _longjmp | 1548 | #undef _longjmp |
| 1547 | 1549 | ||
| 1548 | /* Some platforms redefine this. */ | 1550 | /* Define to setjmp if _setjmp and _longjmp do not work. See _longjmp. */ |
| 1549 | #undef _setjmp | 1551 | #undef _setjmp |
| 1550 | 1552 | ||
| 1551 | /* Some platforms that do not use configure define this to include extra | 1553 | /* Some platforms that do not use configure define this to include extra |
diff --git a/autogen/configure b/autogen/configure index 12239818695..885b6f4b471 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -7218,6 +7218,7 @@ fi | |||
| 7218 | nw="$nw -Wswitch-default" # Too many warnings for now | 7218 | nw="$nw -Wswitch-default" # Too many warnings for now |
| 7219 | nw="$nw -Wfloat-equal" # warns about high-quality code | 7219 | nw="$nw -Wfloat-equal" # warns about high-quality code |
| 7220 | nw="$nw -Winline" # OK to ignore 'inline' | 7220 | nw="$nw -Winline" # OK to ignore 'inline' |
| 7221 | nw="$nw -Wjump-misses-init" # We sometimes safely jump over init. | ||
| 7221 | nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning | 7222 | nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning |
| 7222 | nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations | 7223 | nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations |
| 7223 | 7224 | ||
| @@ -15480,15 +15481,46 @@ else | |||
| 15480 | ;; | 15481 | ;; |
| 15481 | esac | 15482 | esac |
| 15482 | fi | 15483 | fi |
| 15484 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _setjmp" >&5 | ||
| 15485 | $as_echo_n "checking for _setjmp... " >&6; } | ||
| 15486 | if test "${emacs_cv_func__setjmp+set}" = set; then : | ||
| 15487 | $as_echo_n "(cached) " >&6 | ||
| 15488 | else | ||
| 15489 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 15490 | /* end confdefs.h. */ | ||
| 15491 | #include <setjmp.h> | ||
| 15483 | 15492 | ||
| 15484 | case $opsys in | 15493 | int |
| 15485 | sol2* | unixware ) | 15494 | main () |
| 15495 | { | ||
| 15496 | jmp_buf j; | ||
| 15497 | if (! _setjmp (j)) | ||
| 15498 | _longjmp (j, 1); | ||
| 15499 | ; | ||
| 15500 | return 0; | ||
| 15501 | } | ||
| 15502 | _ACEOF | ||
| 15503 | if ac_fn_c_try_link "$LINENO"; then : | ||
| 15504 | emacs_cv_func__setjmp=yes | ||
| 15505 | else | ||
| 15506 | emacs_cv_func__setjmp=no | ||
| 15507 | fi | ||
| 15508 | rm -f core conftest.err conftest.$ac_objext \ | ||
| 15509 | conftest$ac_exeext conftest.$ac_ext | ||
| 15510 | fi | ||
| 15511 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_func__setjmp" >&5 | ||
| 15512 | $as_echo "$emacs_cv_func__setjmp" >&6; } | ||
| 15513 | if test $emacs_cv_func__setjmp = no; then | ||
| 15486 | 15514 | ||
| 15487 | $as_echo "#define _setjmp setjmp" >>confdefs.h | 15515 | $as_echo "#define _setjmp setjmp" >>confdefs.h |
| 15488 | 15516 | ||
| 15489 | 15517 | ||
| 15490 | $as_echo "#define _longjmp longjmp" >>confdefs.h | 15518 | $as_echo "#define _longjmp longjmp" >>confdefs.h |
| 15491 | 15519 | ||
| 15520 | fi | ||
| 15521 | |||
| 15522 | case $opsys in | ||
| 15523 | sol2* | unixware ) | ||
| 15492 | 15524 | ||
| 15493 | $as_echo "#define TIOCSIGSEND TIOCSIGNAL" >>confdefs.h | 15525 | $as_echo "#define TIOCSIGSEND TIOCSIGNAL" >>confdefs.h |
| 15494 | 15526 | ||