Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym

[oweals/cde.git] / cde / lib / DtSvc / DtEncap / local.c

diff --git a/cde/lib/DtSvc/DtEncap/local.c b/cde/lib/DtSvc/DtEncap/local.c
index 54913a45f86722f7882c138e94397580ab383e46..a8f4dbe71520257977f4dbbfb8f804ab18435e91 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/local.c
+++ b/cde/lib/DtSvc/DtEncap/local.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -35,12 +35,8 @@
 #define __need_timeval   /* Needed for "struct timeval" from <time.h>. */
 #define __need_fd_set
 
-#include <bms/sbport.h> 
-#ifdef __osf__
-#include <sys/time.h>     /* For declaration of select(). */
-#else
+#include <bms/sbport.h>
 #include <time.h>
-#endif
 #include <errno.h>
 #include <signal.h>
 
@@ -206,7 +202,7 @@ void local_channel_object_input_handler(void * client_data,
   timeout.tv_sec = 0;
   timeout.tv_usec = 0;
   
-#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
+#if defined(SVR4) || defined(__hpux) || defined(__OpenBSD__) || defined(__linux__)
   select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
 #else
   /* UX has select defined with int*, not fd_set* parms */