Patches for KDE libs and base on solaris

[Ian Reinhart Geiser]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Tuesday 12 November 2002 03:54 am, Simon Hausmann wrote:
> Index: kdecore/kextsock.h
> ===================================================================
> RCS file: /home/kde/kdelibs/kdecore/kextsock.h,v
> retrieving revision 1.30
> diff -u -r1.30 kextsock.h
> --- kdecore/kextsock.h  2002/10/03 13:44:52     1.30
> +++ kdecore/kextsock.h  2002/11/12 04:15:29
> @@ -46,6 +46,7 @@
>  #define IO_AcceptError         (IO_UnspecifiedError+2)
>  #define IO_LookupError         (IO_UnspecifiedError+3)
>  
> +
>  class KExtendedSocketPrivate;
>  /**
>   * The extended socket class.
>
> Bogus.
Doh yeah, this patch is suppose to be instead:
Index: kextsock.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kextsock.cpp,v
retrieving revision 1.42
diff -u -r1.42 kextsock.cpp
- --- kextsock.cpp        2002/10/07 11:09:09     1.42
+++ kextsock.cpp        2002/11/12 11:11:19
@@ -21,6 +21,11 @@
  **/

 #include <config.h>
+#include "kdebug.h"
+#include "kextsock.h"
+#include "ksockaddr.h"
+#include "ksocks.h"
+

 #include <sys/types.h>
 #include <sys/socket.h>
@@ -49,10 +54,6 @@
 #include <qdns.h>
 #include <qguardedptr.h>

- -#include "kdebug.h"
- -#include "kextsock.h"
- -#include "ksockaddr.h"
- -#include "ksocks.h"

 #ifndef HAVE_SOCKADDR_IN6
 // The system doesn't have sockaddr_in6
@@ -60,7 +61,6 @@
 #define CLOBBER_IN6
 #endif
 #include "netsupp.h"
- -
 #include "kextsocklookup.h"

 //
@@ -1437,6 +1437,9 @@
   d->status = lookupDone;
 }

+#ifdef open
+#undef open
+#endif
 bool KExtendedSocket::open(int mode)
 {
   if (mode != IO_Raw | IO_ReadWrite)

This fixes the problems of Open vs Open64 on Solaris.  Ideally we should fix 
this in Qt's method only maby we should make ours work. Again that is 3.2 
material.

Cheers
	-ian reinhart geiser
- -- 
========================================
Fifth Law of Procrastination:
	Procrastination avoids boredom; one never has the feeling that
there is nothing important to do.
========================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE90OKNPy62TRm8dvgRAsxJAKDXuAtjbu80MUvpYgm/LfYV6IEsZACcCa1j
T8/jcQbdGVSXHX16+m+c1MI=
=U2qY
-----END PGP SIGNATURE-----