From: markus schnalke <meillo@marmaro.de>
Date: Mon, 26 Mar 2012 20:28:34 +0000 (+0200)
Subject: Ignore OSPEED/ospeed in termcap. Nothing current should need this.
X-Git-Tag: mmh-thesis-end~186
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=a567638a9445d091f6334ac2de2fc0e57309eb42;p=mmh

Ignore OSPEED/ospeed in termcap. Nothing current should need this.
Remove autoconf ospeed checks.

Merged from nmh. Thanks to Lyndon Nerenberg and Ken Hornstein.
---

diff --git a/configure.ac b/configure.ac
index 4a6b8ee..133c71d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -466,35 +466,6 @@ dnl tests will find it when it tries to link test programs.
 nmh_save_LIBS="$LIBS"
 LIBS="$TERMLIB $LIBS"
 
-dnl Checks for external variable ospeed in the termcap library.
-AC_CACHE_CHECK(if an include file defines ospeed,
-nmh_cv_decl_ospeed_include_defines,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#if HAVE_TERMIOS_H
-# include <termios.h>
-#endif
-#if HAVE_TERMCAP_H
-# include <termcap.h>
-#endif]], [[ospeed = 0;]])],
-nmh_cv_decl_ospeed_include_defines=yes,nmh_cv_decl_ospeed_include_defines=no)])
-
-if test $nmh_cv_decl_ospeed_include_defines = no; then
-  AC_CACHE_CHECK(if you must define ospeed,
-  nmh_cv_decl_ospeed_must_define,
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-  [[extern short ospeed; ospeed = 0;]])],
-  nmh_cv_decl_ospeed_must_define=yes,nmh_cv_decl_ospeed_must_define=no)])
-fi
-
-AH_TEMPLATE(HAVE_OSPEED, [Define to 1 if your termcap library has the ospeed variable.])
-if test $nmh_cv_decl_ospeed_include_defines = yes; then
-  AC_DEFINE(HAVE_OSPEED)dnl
-elif test $nmh_cv_decl_ospeed_must_define = yes; then
-  AC_DEFINE(HAVE_OSPEED)
-  AC_DEFINE(MUST_DEFINE_OSPEED, 1,
-    [Define to 1 if you have ospeed, but it is not defined in termcap.h.])
-fi
-
 dnl Check if tgetent accepts NULL (and will allocate its own termcap buffer)
 dnl Some termcaps reportedly accept a zero buffer, but then dump core
 dnl in tgetstr().
diff --git a/uip/termsbr.c b/uip/termsbr.c
index b620e2c..e1ea5f8 100644
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -33,20 +33,6 @@
 # define TXTSIZ BUFSIZ
 #endif
 
-/*
-** These variables are sometimes defined in,
-** and needed by the termcap library.
-*/
-#ifdef HAVE_OSPEED
-# ifdef MUST_DEFINE_OSPEED
-extern short ospeed;
-extern char PC;
-# endif
-#else
-short ospeed;
-char PC;
-#endif
-
 static long speedcode;
 
 static int initCO = 0;