Dear all, I attach a patch for the present debian/ - this requires the present upstream current version, 2.0.0.
This fixes the #615783 by replacing $(CC) with $(CXX) in the build script, and makes the present version build by adding -fpermissive to the build options. The real fix is in the OPAL library; I have submitted a patch on their mailing list. Also a trivial patch for #614060. Cheers, Michael
diff -Nur t38modem-1.2.0/debian//changelog t38modem-2.0.0/debian//changelog --- t38modem-1.2.0/debian//changelog 2012-01-27 15:50:19.932160804 +1100 +++ t38modem-2.0.0/debian//changelog 2012-01-27 13:47:25.267803888 +1100 @@ -1,3 +1,13 @@ +t38modem (2.0.0-1) unstable; urgency=low + + * New upstream release + * Remake simplify-makefile, and patch to fix not building with g++ (Closes: #615783) + * Remove Build-Conflicts (Closes: #614060) + * Update to Standards 3.9.2 + * Make it build against OPAL currently in tree (Another FTBFS, no debian bug) + + -- Michael van der Kolff <mvanderko...@gmail.com> Fri, 27 Jan 2012 11:31:11 +1100 + t38modem (1.2.0-1) unstable; urgency=low * New upstream release (Closes: #541333, #549365, #512106) diff -Nur t38modem-1.2.0/debian//control t38modem-2.0.0/debian//control --- t38modem-1.2.0/debian//control 2010-06-04 23:02:23.000000000 +1000 +++ t38modem-2.0.0/debian//control 2012-01-27 11:33:09.987414037 +1100 @@ -4,8 +4,7 @@ Maintainer: Debian VoIP Team <pkg-voip-maintain...@lists.alioth.debian.org> Uploaders: Kilian Krause <kil...@debian.org>, Jose Carlos Garcia Sogo <js...@debian.org>, Mark Purcell <m...@debian.org>, Santiago Garcia Mantinan <ma...@debian.org> Build-Depends: debhelper (>= 7), help2man, libopal-dev, libexpat1-dev -Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14) -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://t38modem.sf.net/ Vcs-Svn: svn://svn.debian.org/pkg-voip/t38modem/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/t38modem/?op=log diff -Nur t38modem-1.2.0/debian//patches/series t38modem-2.0.0/debian//patches/series --- t38modem-1.2.0/debian//patches/series 2010-06-04 22:54:01.000000000 +1000 +++ t38modem-2.0.0/debian//patches/series 2012-01-27 13:47:09.903803145 +1100 @@ -1 +1,2 @@ -simplify-makefile +simplify-makefile-new +t38modem-opal3.10-patch diff -Nur t38modem-1.2.0/debian//patches/simplify-makefile t38modem-2.0.0/debian//patches/simplify-makefile --- t38modem-1.2.0/debian//patches/simplify-makefile 2012-01-27 11:43:13.383443239 +1100 +++ t38modem-2.0.0/debian//patches/simplify-makefile 1970-01-01 10:00:00.000000000 +1000 @@ -1,146 +0,0 @@ -Description: Simplify upstream Makefile (Thks mvanderkolff) -Author: Mark Purcell <m...@debian.org> -Bug-Debian: http://bugs.debian.org/584501 - ---- t38modem-1.2.0.orig/Makefile -+++ t38modem-1.2.0/Makefile -@@ -97,59 +97,29 @@ - # - # - --PROG = t38modem --SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \ -- t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \ -- pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \ -- drv_pty.cxx \ -- main_process.cxx -- --# --# Build t38modem for --# - Open Phone Abstraction Library if defined USE_OPAL --# - Open H323 Library or H323 Plus Library if not defined USE_OPAL --# (NOTE: define NO_PBOOLEAN for Open H323 Library) --# --ifdef USE_OPAL -- VPATH_CXX := opal -- -- SOURCES += \ -- opalutils.cxx \ -- modemep.cxx modemstrm.cxx \ -- h323ep.cxx \ -- sipep.cxx \ -- manager.cxx -- -- ifndef OPALDIR -- OPALDIR=$(HOME)/opal -- endif -- -- OBJDIR_SUFFIX = _opal$(OBJ_SUFFIX) -- STDCCFLAGS += -DUSE_OPAL -- -- include $(OPALDIR)/opal_inc.mak --else -- VPATH_CXX := h323lib -- -- SOURCES += t38protocol.cxx g7231_fake.cxx h323ep.cxx -+%.o: %.cxx -+ $(CXX) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< - -- ifndef OPENH323DIR -- OPENH323DIR=$(HOME)/openh323 -- endif -- -- include $(OPENH323DIR)/openh323u.mak -- -- ifdef NO_PBOOLEAN -- STDCCFLAGS += -DPBoolean=BOOL -- endif --endif -+PROG = t38modem -+OBJECTS := pmutils.o dle.o pmodem.o pmodemi.o drivers.o t30tone.o hdlc.o t30.o fcs.o pmodeme.o enginebase.o t38engine.o audio.o drv_pty.o main_process.o \ -+ opal/opalutils.o opal/modemep.o opal/modemstrm.o opal/h323ep.o opal/sipep.o opal/manager.o -+#SOURCES renamed - but don't have explicit rules. -+#SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \ -+# t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \ -+# pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \ -+# drv_pty.cxx \ -+# main_process.cxx -+ -+USE_UNIX98_PTY := 1 -+CPPFLAGS += `pkg-config --libs --cflags opal` -+CPPFLAGS += -DUSE_OPAL - - # - # If defined COUT_TRACE then enable duplicate the - # output of myPTRACE() to cout - # - ifdef COUT_TRACE --STDCCFLAGS += -DCOUT_TRACE -+CPPFLAGS += -DCOUT_TRACE - endif - - # -@@ -161,7 +131,7 @@ endif - # do not use --old-asn option). - # - ifdef OPTIMIZE_CORRIGENDUM_IFP --STDCCFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP -+CPPFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP - endif - - # -@@ -169,7 +139,7 @@ endif - # output the trace with level N - # - ifdef MYPTRACE_LEVEL --STDCCFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL) -+CPPFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL) - endif - - # -@@ -177,7 +147,7 @@ endif - # output the warnings on level N for big file descriptors - # - ifdef FD_TRACE_LEVEL --STDCCFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL) -+CPPFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL) - endif - - # -@@ -186,7 +156,7 @@ endif - # - CPU usage will be traced - # - ifdef PROCESS_PER_THREAD --STDCCFLAGS += -DPROCESS_PER_THREAD -+CPPFLAGS += -DPROCESS_PER_THREAD - endif - - # -@@ -194,7 +164,7 @@ endif - # will repeat indicator sending on idle - # - ifdef REPEAT_INDICATOR_SENDING --STDCCFLAGS += -DREPEAT_INDICATOR_SENDING -+CPPFLAGS += -DREPEAT_INDICATOR_SENDING - endif - - # -@@ -205,12 +175,15 @@ endif - # Both schemes cen be used simultaneously. - # - ifdef USE_UNIX98_PTY -- STDCCFLAGS += -DUSE_UNIX98_PTY -+ CPPFLAGS += -DUSE_UNIX98_PTY - - ifdef USE_LEGACY_PTY -- STDCCFLAGS += -DUSE_LEGACY_PTY -+ CPPFLAGS += -DUSE_LEGACY_PTY - endif - else -- STDCCFLAGS += -DUSE_LEGACY_PTY -+ CPPFLAGS += -DUSE_LEGACY_PTY - endif - -+ -+$(PROG) : $(OBJECTS) -+ $(CXX) $(CPPFLAGS) -o $(PROG) $(OBJECTS) diff -Nur t38modem-1.2.0/debian//patches/simplify-makefile-new t38modem-2.0.0/debian//patches/simplify-makefile-new --- t38modem-1.2.0/debian//patches/simplify-makefile-new 1970-01-01 10:00:00.000000000 +1000 +++ t38modem-2.0.0/debian//patches/simplify-makefile-new 2012-01-27 13:48:25.695806814 +1100 @@ -0,0 +1,173 @@ +Description: Simplify upstream Makefile - adapt previous simplify-makefile +Author: Michael van der Kolff <mvanderko...@gmail.com> +Bug-Debian: http://bugs.debian.org/584501 + +--- a/Makefile ++++ b/Makefile +@@ -109,60 +109,41 @@ + # + # + +-PROG = t38modem +-SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \ +- t30tone.cxx tone_gen.cxx hdlc.cxx t30.cxx fcs.cxx \ +- pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \ +- drv_pty.cxx \ +- main_process.cxx +- +-# +-# Build t38modem for +-# - Open Phone Abstraction Library if defined USE_OPAL +-# - Open H323 Library or H323 Plus Library if not defined USE_OPAL +-# (NOTE: define NO_PBOOLEAN for Open H323 Library) +-# +-ifdef USE_OPAL +- VPATH_CXX := opal +- +- SOURCES += \ +- opalutils.cxx \ +- modemep.cxx modemstrm.cxx \ +- h323ep.cxx \ +- sipep.cxx \ +- manager.cxx \ +- fake_codecs.cxx \ +- +- ifndef OPALDIR +- OPALDIR=$(HOME)/opal +- endif +- +- OBJDIR_SUFFIX = _opal$(OBJ_SUFFIX) +- STDCCFLAGS += -DUSE_OPAL ++%.o: %.cxx ++ $(CXX) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< + +- include $(OPALDIR)/opal_inc.mak +-else +- VPATH_CXX := h323lib +- +- SOURCES += t38protocol.cxx audio_chan.cxx g7231_fake.cxx h323ep.cxx +- +- ifndef OPENH323DIR +- OPENH323DIR=$(HOME)/openh323 +- endif +- +- include $(OPENH323DIR)/openh323u.mak +- +- ifdef NO_PBOOLEAN +- STDCCFLAGS += -DPBoolean=BOOL +- endif +-endif ++PROG = t38modem ++OBJECTS := pmutils.o dle.o pmodem.o pmodemi.o drivers.o \ ++ t30tone.o tone_gen.o hdlc.o t30.o fcs.o \ ++ pmodeme.o enginebase.o t38engine.o audio.o \ ++ drv_pty.o \ ++ main_process.o \ ++ opal/opalutils.o \ ++ opal/modemep.o opal/modemstrm.o \ ++ opal/h323ep.o \ ++ opal/sipep.o \ ++ opal/manager.o \ ++ opal/fake_codecs.o ++#Renamed SOURCES - no explicit rules ++#SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \ ++# t30tone.cxx tone_gen.cxx hdlc.cxx t30.cxx fcs.cxx \ ++# pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \ ++# drv_pty.cxx \ ++# main_process.cxx ++ ++USE_UNIX98_PTY := 1 ++CPPFLAGS += `pkg-config --cflags opal` ++LDFLAGS += `pkg-config --libs opal` ++CPPFLAGS += -DUSE_OPAL ++# Unfortunately, T38modem has a bug that mandates this for now. Filing a bug, but for now... ++CPPFLAGS += -fpermissive + + # + # If defined COUT_TRACE then enable duplicate the + # output of myPTRACE() to cout + # + ifdef COUT_TRACE +-STDCCFLAGS += -DCOUT_TRACE ++CPPFLAGS += -DCOUT_TRACE + endif + + # +@@ -174,7 +155,7 @@ + # do not use --old-asn option). + # + ifdef OPTIMIZE_CORRIGENDUM_IFP +-STDCCFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP ++CPPFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP + endif + + # +@@ -182,7 +163,7 @@ + # output the trace with level N + # + ifdef MYPTRACE_LEVEL +-STDCCFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL) ++CPPFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL) + endif + + # +@@ -190,7 +171,7 @@ + # output the warnings on level N for big file descriptors + # + ifdef FD_TRACE_LEVEL +-STDCCFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL) ++CPPFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL) + endif + + # +@@ -199,7 +180,7 @@ + # - CPU usage will be traced + # + ifdef PROCESS_PER_THREAD +-STDCCFLAGS += -DPROCESS_PER_THREAD ++CPPFLAGS += -DPROCESS_PER_THREAD + endif + + # +@@ -207,7 +188,7 @@ + # will repeat indicator sending on idle + # + ifdef REPEAT_INDICATOR_SENDING +-STDCCFLAGS += -DREPEAT_INDICATOR_SENDING ++CPPFLAGS += -DREPEAT_INDICATOR_SENDING + endif + + # +@@ -218,13 +199,13 @@ + # Both schemes cen be used simultaneously. + # + ifdef USE_UNIX98_PTY +- STDCCFLAGS += -DUSE_UNIX98_PTY ++ CPPFLAGS += -DUSE_UNIX98_PTY + + ifdef USE_LEGACY_PTY +- STDCCFLAGS += -DUSE_LEGACY_PTY ++ CPPFLAGS += -DUSE_LEGACY_PTY + endif + else +- STDCCFLAGS += -DUSE_LEGACY_PTY ++ CPPFLAGS += -DUSE_LEGACY_PTY + endif + + # +@@ -233,6 +214,14 @@ + # (workaround for mgetty-voice) + # + ifdef ALAW_132_BIT_REVERSE +- STDCCFLAGS += -DALAW_132_BIT_REVERSE ++ CPPFLAGS += -DALAW_132_BIT_REVERSE + endif + ++.PHONY: all clean ++all: $(PROG) ++ ++clean: ++ rm -f $(PROG) $(OBJECTS) ++ ++$(PROG) : $(OBJECTS) ++ $(CXX) $(CPPFLAGS) -o $(PROG) $(OBJECTS) $(LDFLAGS) diff -Nur t38modem-1.2.0/debian//patches/t38modem-opal3.10-patch t38modem-2.0.0/debian//patches/t38modem-opal3.10-patch --- t38modem-1.2.0/debian//patches/t38modem-opal3.10-patch 1970-01-01 10:00:00.000000000 +1000 +++ t38modem-2.0.0/debian//patches/t38modem-opal3.10-patch 2012-01-27 11:51:52.171468347 +1100 @@ -0,0 +1,192 @@ +Author: "Peter Katzmann" <pk1...@users.sf.net> +URL: http://sourceforge.net/tracker/index.php?func=detail&aid=3462909&group_id=152230&atid=783658 +With this patch, t38modem builds against the OPAL in debian +diff -urwb t38modem/opal/fake_codecs.cxx ../t38modem-2.0.0/opal/fake_codecs.cxx +--- t38modem/opal/fake_codecs.cxx 2010-03-24 11:48:29.000000000 +0100 ++++ ../t38modem-2.0.0/opal/fake_codecs.cxx 2011-11-07 20:30:25.772000161 +0100 +@@ -40,13 +40,7 @@ + #include <opal/buildopts.h> + + ///////////////////////////////////////////////////////////////////////////// +-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build)) + +-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) >= PACK_VERSION(3, 8, 1)) +- #error *** Uncompatible OPAL version (required >= 3.8.1) *** +-#endif +- +-#undef PACK_VERSION + ///////////////////////////////////////////////////////////////////////////// + + #include <opal/transcoders.h> +diff -urwb t38modem/opal/h323ep.cxx ../t38modem-2.0.0/opal/h323ep.cxx +--- t38modem/opal/h323ep.cxx 2011-02-11 10:41:07.000000000 +0100 ++++ ../t38modem-2.0.0/opal/h323ep.cxx 2011-11-08 17:56:03.941999997 +0100 +@@ -192,8 +192,8 @@ + + virtual void AdjustMediaFormats( + bool local, ///< Media formats a local ones to be presented to remote +- OpalMediaFormatList & mediaFormats, ///< Media formats to use +- OpalConnection * otherConnection ///< Other connection we are adjusting media for ++ OpalConnection * connection, ///< Connection that is about to use formats ++ OpalMediaFormatList & mediaFormats ///< Media formats to use + ) const; + + protected: +@@ -549,7 +549,7 @@ + bool MyH323Connection::SwitchFaxMediaStreams(bool enableFax) + { + OpalMediaFormatList mediaFormats = GetMediaFormats(); +- AdjustMediaFormats(true, mediaFormats, NULL); ++ AdjustMediaFormats(true, NULL, mediaFormats); + + PTRACE(3, "MyH323Connection::SwitchFaxMediaStreams:\n" << setfill('\n') << mediaFormats << setfill(' ')); + +@@ -650,14 +650,13 @@ + return mediaFormats; + } + +-void MyH323Connection::AdjustMediaFormats( +- bool local, +- OpalMediaFormatList & mediaFormats, +- OpalConnection * otherConnection) const ++void MyH323Connection::AdjustMediaFormats(bool local, ++ OpalConnection * connection, ++ OpalMediaFormatList & mediaFormats) const + { + PTRACE(4, "MyH323Connection::AdjustMediaFormats:\n" << setfill('\n') << mediaFormats << setfill(' ')); + +- H323Connection::AdjustMediaFormats(local, mediaFormats, otherConnection); ++ AdjustMediaFormats(local, connection, mediaFormats); + + if (local) { + PStringArray order; +diff -urwb t38modem/opal/modemep.cxx ../t38modem-2.0.0/opal/modemep.cxx +--- t38modem/opal/modemep.cxx 2011-02-11 10:41:07.000000000 +0100 ++++ ../t38modem-2.0.0/opal/modemep.cxx 2011-11-08 17:56:03.924999997 +0100 +@@ -130,14 +130,7 @@ + #include <ptlib.h> + + #include <opal/buildopts.h> +-///////////////////////////////////////////////////////////////////////////// +-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build)) +- +-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) == PACK_VERSION(3, 9, 0)) +- #error *** Uncompatible OPAL version (required == 3.9.0, use SVN TRUNK 24174) *** +-#endif + +-#undef PACK_VERSION + ///////////////////////////////////////////////////////////////////////////// + + #include <opal/patch.h> +@@ -882,7 +875,7 @@ + + if (faxMode) { + OpalMediaFormatList otherMediaFormats = other->GetMediaFormats(); +- other->AdjustMediaFormats(false, otherMediaFormats, NULL); ++ other->AdjustMediaFormats(false, other, otherMediaFormats); + + PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" << + setfill('\n') << otherMediaFormats << setfill(' ')); +@@ -941,7 +934,7 @@ + + if (other != NULL) { + OpalMediaFormatList otherMediaFormats = other->GetMediaFormats(); +- other->AdjustMediaFormats(false, otherMediaFormats, NULL); ++ other->AdjustMediaFormats(false, other, otherMediaFormats); + + PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" << + setfill('\n') << otherMediaFormats << setfill(' ')); +@@ -1072,11 +1065,11 @@ + bool ModemConnection::UpdateMediaStreams(OpalConnection &other) + { + OpalMediaFormatList otherMediaFormats = other.GetMediaFormats(); +- other.AdjustMediaFormats(true, otherMediaFormats, NULL); ++ other.AdjustMediaFormats(true, NULL, otherMediaFormats); + + OpalMediaFormatList thisMediaFormats = GetMediaFormats(); +- AdjustMediaFormats(true, thisMediaFormats, NULL); +- other.AdjustMediaFormats(true, thisMediaFormats, this); ++ AdjustMediaFormats(true, NULL, thisMediaFormats); ++ other.AdjustMediaFormats(true, this, thisMediaFormats); + + PTRACE(3, "ModemConnection::UpdateMediaStreams:\n" + "patching " << setfill(',') << thisMediaFormats << setfill(' ') << "\n" +@@ -1189,8 +1182,9 @@ + OpalMediaPatch *patch = otherSink->GetPatch(); + + if (patch != NULL) { +- otherSink->RemovePatch(patch); +- patch->GetSource().Close(); ++ /* otherSink->RemovePatch(patch); ++ patch->GetSource().Close();*/ ++ otherSink->SetPatch(NULL); + } + + PTRACE(4, "ModemConnection::UpdateMediaStreams: opening source for sink " << *otherSink); +@@ -1223,7 +1217,8 @@ + OpalMediaPatch *patch = otherSource->GetPatch(); + + if (patch != NULL) +- otherSource->RemovePatch(patch); ++/* otherSource->RemovePatch(patch);*/ ++ otherSource->SetPatch(NULL); + + // NOTE: Both sinks must have the same session ID for T.38 <-> PCM transcoding !!! + PTRACE(4, "ModemConnection::UpdateMediaStreams: opening sink for source " << *otherSource); +diff -urwb t38modem/opal/modemep.h ../t38modem-2.0.0/opal/modemep.h +--- t38modem/opal/modemep.h 2010-03-15 14:40:28.000000000 +0100 ++++ ../t38modem-2.0.0/opal/modemep.h 2011-11-07 20:30:25.783000161 +0100 +@@ -53,14 +53,7 @@ + #ifndef _MODEM_EP_H + #define _MODEM_EP_H + +-///////////////////////////////////////////////////////////////////////////// +-#define PACK_VERSION(major, minor, build) (((((major) << 8) + (minor)) << 8) + (build)) +- +-#if !(PACK_VERSION(OPAL_MAJOR, OPAL_MINOR, OPAL_BUILD) >= PACK_VERSION(3, 8, 0)) +- #error *** Uncompatible OPAL version (required >= 3.8.0) *** +-#endif + +-#undef PACK_VERSION + ///////////////////////////////////////////////////////////////////////////// + #include <opal/endpoint.h> + ///////////////////////////////////////////////////////////////////////////// +diff -urwb t38modem/opal/sipep.cxx ../t38modem-2.0.0/opal/sipep.cxx +--- t38modem/opal/sipep.cxx 2011-02-11 10:41:07.000000000 +0100 ++++ ../t38modem-2.0.0/opal/sipep.cxx 2011-11-08 08:54:20.495999996 +0100 +@@ -183,8 +183,8 @@ + + virtual void AdjustMediaFormats( + bool local, ///< Media formats a local ones to be presented to remote +- OpalMediaFormatList & mediaFormats, ///< Media formats to use +- OpalConnection * otherConnection ///< Other connection we are adjusting media for ++ OpalConnection * otherConnection, ///< Other connection we are adjusting media for ++ OpalMediaFormatList & mediaFormats ///< Media formats to use + ) const; + + protected: +@@ -490,7 +490,7 @@ + } + + OpalMediaFormatList mediaFormats = GetMediaFormats(); +- AdjustMediaFormats(true, mediaFormats, NULL); ++ AdjustMediaFormats(true, NULL, mediaFormats); + + PTRACE(3, "MySIPConnection::SwitchFaxMediaStreams:\n" << setfill('\n') << mediaFormats << setfill(' ')); + +@@ -592,12 +592,12 @@ + + void MySIPConnection::AdjustMediaFormats( + bool local, +- OpalMediaFormatList & mediaFormats, +- OpalConnection * otherConnection) const ++ OpalConnection * otherConnection, ++ OpalMediaFormatList & mediaFormats) const + { + PTRACE(4, "MySIPConnection::AdjustMediaFormats:\n" << setfill('\n') << mediaFormats << setfill(' ')); + +- SIPConnection::AdjustMediaFormats(local, mediaFormats, otherConnection); ++ SIPConnection::AdjustMediaFormats(local, otherConnection, mediaFormats); + + if (local) { + PStringArray order;
