sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 12:56:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build with gcc 3.3

Browse source
This commit is contained in:
Kris Kennaway 2003-07-18 02:19:43 +00:00
parent 8ea51524e6
commit 182efcda79
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=85082
2 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net-mgmt/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
View file

@ -1,6 +1,14 @@
--- classes/src/ArtsRttTimeSeriesTableData.cc.orig Thu Oct 19 16:37:14 2000
+++ classes/src/ArtsRttTimeSeriesTableData.cc Thu Jul 17 19:17:37 2003
@@ -192,7 +192,7 @@
+++ classes/src/ArtsRttTimeSeriesTableData.cc Thu Jul 17 19:19:28 2003
@@ -47,6 +47,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <time.h>
+#include <assert.h>
}
#include <string>
@@ -192,7 +193,7 @@
ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
uint32_t timeBase,
uint32_t prevSecsOffset,
@ -9,7 +17,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampSecsLength = 0;
@@ -217,7 +217,7 @@
@@ -217,7 +218,7 @@
timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
rleFlags |= (timestampUsecsLength - 1);
@ -18,7 +26,7 @@
if (rttLength > 0)
g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
if (timestampSecsLength > 0)
@@ -232,14 +232,14 @@
@@ -232,14 +233,14 @@
// int ArtsRttTimeSeriesTableEntry::write(int fd,
// uint32_t timeBase,
// uint32_t prevSecsOffset,
@ -35,7 +43,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampSecsLength = 0;
@@ -302,7 +302,7 @@
@@ -302,7 +303,7 @@
//----------------------------------------------------------------------------
uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
uint32_t prevSecsOffset,
@ -44,7 +52,7 @@
{
uint32_t length = sizeof(uint8_t); // always have rleFlags
if (this->_rtt != k_droppedPacketRtt) {
@@ -330,13 +330,13 @@
@@ -330,13 +331,13 @@
istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
uint32_t timeBase,
uint32_t prevSecsOffset,
@ -60,7 +68,7 @@
if (rleFlags & 0x80) {
// it's a dropped packet; RTT length is 0
@@ -374,7 +374,7 @@
@@ -374,7 +375,7 @@
//----------------------------------------------------------------------------
int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
uint32_t prevSecsOffset,
@ -69,7 +77,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampUsecsLength = 0;
@@ -594,7 +594,7 @@
@@ -594,7 +595,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -78,7 +86,7 @@
{
uint32_t numRttEntries, rttEntryNum;
ArtsRttTimeSeriesTableEntry rttEntry;
@@ -623,7 +623,7 @@
@@ -623,7 +624,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -87,7 +95,7 @@
{
uint32_t numRttEntries, rttEntryNum;
ArtsRttTimeSeriesTableEntry rttEntry;
@@ -664,7 +664,7 @@
@@ -664,7 +665,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -96,7 +104,7 @@
{
uint32_t length = 0;
uint32_t rttEntryNum, numRttEntries;
@@ -693,7 +693,7 @@
@@ -693,7 +694,7 @@
//
//----------------------------------------------------------------------------
ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
@ -105,7 +113,7 @@
{
uint32_t numRttEntries, rttEntryNum;
uint32_t rttUsecs;
@@ -729,7 +729,7 @@
@@ -729,7 +730,7 @@
//............................................................................
//
//----------------------------------------------------------------------------

32
net/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
View file

@ -1,6 +1,14 @@
--- classes/src/ArtsRttTimeSeriesTableData.cc.orig Thu Oct 19 16:37:14 2000
+++ classes/src/ArtsRttTimeSeriesTableData.cc Thu Jul 17 19:17:37 2003
@@ -192,7 +192,7 @@
+++ classes/src/ArtsRttTimeSeriesTableData.cc Thu Jul 17 19:19:28 2003
@@ -47,6 +47,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <time.h>
+#include <assert.h>
}
#include <string>
@@ -192,7 +193,7 @@
ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
uint32_t timeBase,
uint32_t prevSecsOffset,
@ -9,7 +17,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampSecsLength = 0;
@@ -217,7 +217,7 @@
@@ -217,7 +218,7 @@
timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
rleFlags |= (timestampUsecsLength - 1);
@ -18,7 +26,7 @@
if (rttLength > 0)
g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
if (timestampSecsLength > 0)
@@ -232,14 +232,14 @@
@@ -232,14 +233,14 @@
// int ArtsRttTimeSeriesTableEntry::write(int fd,
// uint32_t timeBase,
// uint32_t prevSecsOffset,
@ -35,7 +43,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampSecsLength = 0;
@@ -302,7 +302,7 @@
@@ -302,7 +303,7 @@
//----------------------------------------------------------------------------
uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
uint32_t prevSecsOffset,
@ -44,7 +52,7 @@
{
uint32_t length = sizeof(uint8_t); // always have rleFlags
if (this->_rtt != k_droppedPacketRtt) {
@@ -330,13 +330,13 @@
@@ -330,13 +331,13 @@
istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
uint32_t timeBase,
uint32_t prevSecsOffset,
@ -60,7 +68,7 @@
if (rleFlags & 0x80) {
// it's a dropped packet; RTT length is 0
@@ -374,7 +374,7 @@
@@ -374,7 +375,7 @@
//----------------------------------------------------------------------------
int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
uint32_t prevSecsOffset,
@ -69,7 +77,7 @@
{
uint8_t rleFlags = 0;
uint8_t timestampUsecsLength = 0;
@@ -594,7 +594,7 @@
@@ -594,7 +595,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -78,7 +86,7 @@
{
uint32_t numRttEntries, rttEntryNum;
ArtsRttTimeSeriesTableEntry rttEntry;
@@ -623,7 +623,7 @@
@@ -623,7 +624,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -87,7 +95,7 @@
{
uint32_t numRttEntries, rttEntryNum;
ArtsRttTimeSeriesTableEntry rttEntry;
@@ -664,7 +664,7 @@
@@ -664,7 +665,7 @@
//............................................................................
//
//----------------------------------------------------------------------------
@ -96,7 +104,7 @@
{
uint32_t length = 0;
uint32_t rttEntryNum, numRttEntries;
@@ -693,7 +693,7 @@
@@ -693,7 +694,7 @@
//
//----------------------------------------------------------------------------
ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
@ -105,7 +113,7 @@
{
uint32_t numRttEntries, rttEntryNum;
uint32_t rttUsecs;
@@ -729,7 +729,7 @@
@@ -729,7 +730,7 @@
//............................................................................
//
//----------------------------------------------------------------------------