[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-05-24 13:36:13
Message-ID: 1243172173.330632.3510.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 972269 by ossi:

clean up includes, check for sys/sockio.h

hopefully fixes
BUG: 191905

 M  +1 -0      ConfigureChecks.cmake  
 M  +6 -9      backend/choose.c  
 M  +3 -0      config-kdm.h.cmake  


--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #972268:972269
@@ -17,6 +17,7 @@
 check_include_files(lastlog.h HAVE_LASTLOG_H)
 check_include_files(termio.h HAVE_TERMIO_H)
 check_include_files(termios.h HAVE_TERMIOS_H)
+check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H)
 
 check_symbol_exists(sysinfo "sys/sysinfo.h" HAVE_SYSINFO)
 check_symbol_exists(systeminfo "sys/systeminfo.h" HAVE_SYS_SYSTEMINFO)
--- trunk/KDE/kdebase/workspace/kdm/backend/choose.c #972268:972269
@@ -39,13 +39,16 @@
 #include "dm_socket.h"
 
 #include <ctype.h>
-
-#ifdef __svr4__
+#include <sys/ioctl.h>
+#ifdef HAVE_SYS_SOCKIO_H
 # include <sys/sockio.h>
 #endif
+#ifndef __GNU__
+# include <net/if.h>
+#endif
 #include <arpa/inet.h>
+#include <netdb.h>
 
-#include <sys/ioctl.h>
 #ifdef STREAMSCONN
 # ifdef WINTCP /* NCR with Wollongong TCP */
 #  include <netinet/ip.h>
@@ -56,12 +59,6 @@
 # include <netdir.h>
 #endif
 
-#if !defined(__GNU__) && !defined(__hpux) /* XXX __hpux might be wrong */
-# include <net/if.h>
-#endif
-
-#include <netdb.h>
-
 typedef struct _Choices {
 	struct _Choices *next;
 	ARRAY8 client;
--- trunk/KDE/kdebase/workspace/kdm/config-kdm.h.cmake #972268:972269
@@ -123,6 +123,9 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #cmakedefine HAVE_TERMIOS_H 1
 
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#cmakedefine HAVE_SYS_SOCKIO_H 1
+
 /* Define to 1 if the ck-connector library is found */
 #cmakedefine HAVE_CKCONNECTOR 1
 
[prev in list] [next in list] [prev in thread] [next in thread]