aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorGlenn Morris2012-07-30 07:30:20 -0700
committerGlenn Morris2012-07-30 07:30:20 -0700
commit0a763bd17bc8c282523a137ad9984c8a314aabd2 (patch)
treeb97370e13160e5de82a9080ce9085b6cdd23d35e /src/s
parent259a41782b8470ff72809b83c7b116bf219f14f3 (diff)
downloademacs-0a763bd17bc8c282523a137ad9984c8a314aabd2.tar.gz
emacs-0a763bd17bc8c282523a137ad9984c8a314aabd2.zip
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.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/irix6-5.h3
-rw-r--r--src/s/usg5-4-common.h5
2 files changed, 0 insertions, 8 deletions
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/>. */
19 19
20#include "usg5-4-common.h" 20#include "usg5-4-common.h"
21 21
22#undef _longjmp /* use system versions, not conservative aliases */
23#undef _setjmp
24
25#ifdef emacs 22#ifdef emacs
26char *_getpty(); 23char *_getpty();
27#endif 24#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.
20You should have received a copy of the GNU General Public License 20You should have received a copy of the GNU General Public License
21along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 21along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22 22
23/* setjmp and longjmp can safely replace _setjmp and _longjmp,
24 but they will run slower. */
25#define _setjmp setjmp
26#define _longjmp longjmp
27
28/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. 23/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
29 But get <termio.h> first to make sure ttold.h doesn't interfere. */ 24 But get <termio.h> first to make sure ttold.h doesn't interfere. */
30#include <sys/wait.h> 25#include <sys/wait.h>