[Opalvoip-svn] SF.net SVN: opalvoip:[32341] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip:[32341] ptlib/trunk
|
From: <rjo...@us...> - 2014-07-10 01:01:45
|
Revision: 32341
http://sourceforge.net/p/opalvoip/code/32341
Author: rjongbloed
Date: 2014-07-10 01:01:36 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
Merged revision(s) 32305-32340 from ptlib/branches/v2_14:
---------------------
r32339
Changed MergeSym call to dumpbin to use double quote instead of single quote. No idea why it is necessary for some people. Also fixed VS2012 debug build for MergeSym.
---------------------
r32335
Added ability to write a PEthSocket::Frame() object to a PChannel.
Revision Links:
--------------
http://sourceforge.net/p/opalvoip/code/32339
http://sourceforge.net/p/opalvoip/code/32335
Modified Paths:
--------------
ptlib/trunk/include/ptlib/ethsock.h
ptlib/trunk/src/ptlib/common/pethsock.cxx
ptlib/trunk/tools/MergeSym/MergeSym.cxx
ptlib/trunk/tools/MergeSym/MergeSym_2012.vcxproj
Property Changed:
----------------
ptlib/trunk/
Index: ptlib/trunk
===================================================================
--- ptlib/trunk 2014-07-10 00:52:51 UTC (rev 32340)
+++ ptlib/trunk 2014-07-10 01:01:36 UTC (rev 32341)
Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -5,7 +5,7 ##
/ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723
/ptlib/branches/v2_10:25177-29189
/ptlib/branches/v2_12:28485-31603
-/ptlib/branches/v2_14:31501-32304
+/ptlib/branches/v2_14:31501-32340
/ptlib/branches/v2_2:20746,20791,20827,22014,22942
/ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
/ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/include/ptlib/ethsock.h
===================================================================
--- ptlib/trunk/include/ptlib/ethsock.h 2014-07-10 00:52:51 UTC (rev 32340)
+++ ptlib/trunk/include/ptlib/ethsock.h 2014-07-10 01:01:36 UTC (rev 32341)
@@ -228,6 +228,10 @@
PINDEX maxSize = 65536
);
+ virtual bool Write(
+ PChannel & channel
+ ) const;
+
virtual bool Read(
PChannel & channel,
PINDEX packetSize = P_MAX_INDEX
@@ -290,6 +294,8 @@
const PTime & GetTimestamp() const { return m_timestamp; }
bool IsFragmentated() const { return m_fragmentated; }
+ PINDEX GetSize() const { return m_rawSize; }
+
protected:
PTime m_timestamp;
PBYTEArray m_rawData;
Modified: ptlib/trunk/src/ptlib/common/pethsock.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/pethsock.cxx 2014-07-10 00:52:51 UTC (rev 32340)
+++ ptlib/trunk/src/ptlib/common/pethsock.cxx 2014-07-10 01:01:36 UTC (rev 32341)
@@ -334,6 +334,12 @@
}
+bool PEthSocket::Frame::Write(PChannel & channel) const
+{
+ return channel.Write(m_rawData, m_rawSize);
+}
+
+
bool PEthSocket::Frame::Read(PChannel & channel, PINDEX packetSize)
{
PreRead();
Modified: ptlib/trunk/tools/MergeSym/MergeSym.cxx
===================================================================
--- ptlib/trunk/tools/MergeSym/MergeSym.cxx 2014-07-10 00:52:51 UTC (rev 32340)
+++ ptlib/trunk/tools/MergeSym/MergeSym.cxx 2014-07-10 01:01:36 UTC (rev 32341)
@@ -92,7 +92,7 @@
MergeSym::MergeSym()
- : PProcess("Equivalence", "MergeSym", 1, 9, ReleaseCode, 1, false, true)
+ : PProcess("Equivalence", "MergeSym", 1, 9, ReleaseCode, 2, false, true)
{
}
@@ -270,7 +270,7 @@
PINDEX linecount = 0;
PString dumpbin = args.GetOptionString('d', "dumpbin");
- PPipeChannel pipe(dumpbin + " /symbols /directives '" + lib_filename + "'", PPipeChannel::ReadOnly);
+ PPipeChannel pipe(PSTRSTRM(dumpbin << " /symbols /directives \"" << lib_filename << '"'), PPipeChannel::ReadOnly);
if (!pipe.IsOpen()) {
PError << "\nMergeSym: could not run \"" << dumpbin << "\".\n";
SetTerminationValue(2);
Modified: ptlib/trunk/tools/MergeSym/MergeSym_2012.vcxproj
===================================================================
--- ptlib/trunk/tools/MergeSym/MergeSym_2012.vcxproj 2014-07-10 00:52:51 UTC (rev 32340)
+++ ptlib/trunk/tools/MergeSym/MergeSym_2012.vcxproj 2014-07-10 01:01:36 UTC (rev 32341)
@@ -59,14 +59,14 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='No Trace|Win32'">..\..\bin\$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='No Trace|Win32'">false</LinkIncremental>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir);$(ExecutablePath)</ExecutablePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\include;$(IncludePath)</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\lib\$(Platform)\include;$(ProjectDir)..\..\include;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\lib;$(LibraryPath)</LibraryPath>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='No Trace|Win32'">$(SolutionDir);$(ExecutablePath)</ExecutablePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='No Trace|Win32'">$(SolutionDir)\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='No Trace|Win32'">$(SolutionDir)\lib;$(LibraryPath)</LibraryPath>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir);$(ExecutablePath)</ExecutablePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\Lib\$(Platform)\include;$(ProjectDir)..\..\include;$(IncludePath)</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\lib;$(LibraryPath)</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\lib\$(Platform)\include;$(ProjectDir)..\..\include;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -95,7 +95,6 @@
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ptlibsd.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -136,7 +135,6 @@
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ptlibs.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|