[GnomeMeeting-devel-list] Collection of patches to compile 1.2.3 with upcoming gcc-4.1

[Daniel Veillard <veillard redhat com>]

  Alex Larson rebuilt the latest release onto Rawhide which uses a
prerelease of gcc-4.1, the C++ class checking is harder than ever
and you get failures in a number of declarations for gnomemeeting,
openh323-1.15.6 and pwlib-1.8.7. Attached are the set of gcc-4.1
patches needed, I also added the gcc-4 patches specific to pwlib-1.8.7
which are also needed but may have been already applied to head.
  I will try to provide packages for RHEL4 and Fedora Core 4 to Damien
later today,

Daniel

-- 
Daniel Veillard      | Red Hat http://redhat.com/
veillard redhat com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

--- gnomemeeting-1.2.3/src/endpoint.h.gcc41	2005-12-14 17:30:29.000000000 +0100
+++ gnomemeeting-1.2.3/src/endpoint.h	2005-12-14 17:31:11.000000000 +0100
@@ -284,7 +284,7 @@
    * 		     the endpoint.
    * PRE          :  /
    */
-  OpalMediaFormat::List GMH323EndPoint::GetAvailableAudioCapabilities ();
+  OpalMediaFormat::List GetAvailableAudioCapabilities ();
   
   
   /* DESCRIPTION  :  /

--- openh323-1.15.6/include/ixjlid.h.gcc41	2005-12-14 14:19:04.000000000 +0100
+++ openh323-1.15.6/include/ixjlid.h	2005-12-14 14:19:18.000000000 +0100
@@ -836,7 +836,7 @@
     };
 
     static void SignalHandler(int sig);
-    ExceptionInfo * OpalIxJDevice::GetException();
+    ExceptionInfo * GetException();
     int GetOSHandle() { return os_handle; }
 
   protected:

--- pwlib-1.8.7/include/ptlib/pstring.h.gcc41	2005-02-04 06:19:08.000000000 +0100
+++ pwlib-1.8.7/include/ptlib/pstring.h	2005-12-14 15:13:43.000000000 +0100
@@ -3182,5 +3182,6 @@
     int lastError;
 };
 
+PString psprintf(const char * cfmt, ...);
 
 // End Of File ///////////////////////////////////////////////////////////////
--- pwlib-1.8.7/include/ptclib/vxml.h.gcc41	2005-02-04 06:19:08.000000000 +0100
+++ pwlib-1.8.7/include/ptclib/vxml.h	2005-12-14 15:13:43.000000000 +0100
@@ -366,7 +366,7 @@
 
     virtual PString GetVar(const PString & str) const;
     virtual void SetVar(const PString & ostr, const PString & val);
-    virtual PString PVXMLSession::EvaluateExpr(const PString & oexpr);
+    virtual PString EvaluateExpr(const PString & oexpr);
 
     virtual BOOL RetreiveResource(const PURL & url, PString & contentType, PFilePath & fn, BOOL useCache = TRUE);
 
--- pwlib-1.8.7/src/ptlib/unix/svcproc.cxx.gcc41	2005-12-14 15:50:10.000000000 +0100
+++ pwlib-1.8.7/src/ptlib/unix/svcproc.cxx	2005-12-14 15:50:35.000000000 +0100
@@ -281,6 +281,8 @@
 
 #define new PNEW
 
+extern void PXSignalHandler(int sig);
+
 
 #define	MAX_LOG_LINE_LEN	1024
 

--- pwlib-1.8.7/src/ptclib/pssl.cxx.gcc4	2005-11-15 04:11:31.000000000 -0500
+++ pwlib-1.8.7/src/ptclib/pssl.cxx	2005-11-15 04:11:43.000000000 -0500
@@ -297,14 +297,14 @@
 
 PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
 {
-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
+  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyData, keySize);
 }
 
 
 PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
 {
   const BYTE * keyPtr = keyData;
-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
+  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyPtr, keyData.GetSize());
 }
 
 
@@ -472,14 +472,14 @@
 
 PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
 {
-  certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
+  certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
 }
 
 
 PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
 {
   const BYTE * certPtr = certData;
-  certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
+  certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
 }
 
 
@@ -489,7 +489,7 @@
   PBase64::Decode(certStr, certData);
   if (certData.GetSize() > 0) {
     const BYTE * certPtr = certData;
-    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
+    certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
   }
   else
     certificate = NULL;