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 69d6c4ae4793262ba063165011affaf392ae7d3e..a8f4dbe71520257977f4dbbfb8f804ab18435e91 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/local.c
+++ b/cde/lib/DtSvc/DtEncap/local.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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
+ */
 /*
  * File:         local.c $TOG: local.c /main/5 1999/10/14 15:05:57 mgreess $
  * Language:     C
@@ -13,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>
 
@@ -132,7 +150,7 @@ int local_channel_object_wait_for_termination(SPC_Channel_Ptr channel)
 }
 
 /*----------------------------------------------------------------------+*/
-remove_logfile_local_channel_object(SPC_Channel_Ptr channel)
+int remove_logfile_local_channel_object(SPC_Channel_Ptr channel)
 /*----------------------------------------------------------------------+*/
 {
   int result;
@@ -184,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)
+#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 */