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

List:       kde-devel
Subject:    kdm & XFree 3.9.16
From:       Alexander Feigl <Alexander.Feigl () gmx ! de>
Date:       1999-12-02 16:28:16
[Download RAW message or body]

Hi!

Some days ago there was a thread about XFree 3.9.16 & kdm compilation problems.
Now I tried to make it work under XFree 3.9.16. I moved #include "dm.h" into
extern "C" and adapted some prototypes. ( XFree 3.3.x doesn't provide full
prototypes - so they are in CXdmcp.h).

Can anybody check if this breaks something? chooser compiles now and seems to
work on my machine.



-----------SNIP
--- /home/dreamer/cvs/kdebase/kdm/CXdmcp.cpp	Fri Nov 26 10:53:07 1999
+++ CXdmcp.cpp	Thu Dec  2 17:24:42 1999
@@ -240,9 +240,9 @@
   for (hosts = hostAddrdb; hosts; hosts = hosts->next)
   {
   	if (hosts->type == QUERY)
-			XdmcpFlush (socketFD, &directBuffer, hosts->addr, hosts->addrlen);
+			XdmcpFlush (socketFD, &directBuffer, (char *) hosts->addr, hosts->addrlen);
     else
-			XdmcpFlush (socketFD, &broadcastBuffer, hosts->addr, hosts->addrlen);
+			XdmcpFlush (socketFD, &broadcastBuffer, (char *) hosts->addr, hosts->addrlen);
     }
 	  if (++pingTry < TRIES)
   	  t->start( PING_INTERVAL, true);
--- /home/dreamer/cvs/kdebase/kdm/CXdmcp.h	Wed Nov 17 01:12:05 1999
+++ CXdmcp.h	Thu Dec  2 17:23:45 1999
@@ -31,11 +31,9 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Xatom.h>
-}
 
 #include "dm.h"
 
-extern "C" {
 #include    <X11/Xdmcp.h>
 }
 
@@ -70,14 +68,14 @@
 extern "C" {
 extern int XdmcpARRAY8Equal(ARRAY8 *, ARRAY8 *);
 extern int XdmcpAllocARRAY8 (ARRAY8 *, int);
-extern int XdmcpDisposeARRAY8(ARRAY8 *);
+extern void XdmcpDisposeARRAY8(ARRAY8Ptr);
 extern int XdmcpFill(int , XdmcpBuffer *, char *, int *);
-extern int XdmcpFlush(int, XdmcpBuffer *, void *, int );
+extern int XdmcpFlush(int, XdmcpBuffer *, char *, int );
 extern int XdmcpReadARRAY8(XdmcpBuffer *, ARRAY8 *);
 extern int XdmcpReadHeader(XdmcpBuffer *, XdmcpHeader *);
 extern int XdmcpWriteARRAY8(XdmcpBuffer *, ARRAY8 *);
 extern int XdmcpWriteARRAYofARRAY8(XdmcpBuffer *, ARRAYofARRAY8 *);
-extern int XdmcpWriteCARD16(XdmcpBuffer *, CARD16);
+extern int XdmcpWriteCARD16(XdmcpBuffer *, unsigned);
 extern int XdmcpWriteHeader(XdmcpBuffer *, XdmcpHeader *);
 }
 
-----------SNIP



Greetings

Alexander

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