cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with gcc3.

Browse Source
This commit is contained in:
naddy 2002-09-29 14:32:45 +00:00
parent 078daae9a1
commit a8cba2d423
10 changed files with 157 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ns/patches/patch-drr_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-drr_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- drr.cc.orig Sun Sep 29 13:57:38 2002
+++ drr.cc Sun Sep 29 13:57:48 2002
@@ -32,7 +32,7 @@ class DRR;
class PacketDRR : public PacketQueue {
PacketDRR(): pkts(0),src(-1),bcount(0),prev(0),next(0),deficitCounter(0),turn(0) {}
- friend DRR;
+ friend class DRR;
protected :
int pkts;
int src; //to detect collisions keep track of actual src address

12
net/ns/patches/patch-imep_rxmit_queue_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-imep_rxmit_queue_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- imep/rxmit_queue.h.orig Sun Sep 29 14:03:21 2002
+++ imep/rxmit_queue.h Sun Sep 29 14:03:32 2002
@@ -58,7 +58,7 @@ LIST_HEAD(rexent_head, rexent);
class ReXmitQ;
class ReXmitQIter {
- friend ReXmitQ;
+ friend class ReXmitQ;
public:
inline Packet * next() {

39
net/ns/patches/patch-indep-utils_cmu-scen-gen_setdest_Makefile_in Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Thu Dec 23 00:31:49 1999
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in Sun Sep 29 16:17:52 2002
@@ -32,7 +32,7 @@ prefix = @prefix@
# Pathname of directory to install the binary
BINDEST = @prefix@/bin
-CCX = @CXX@
+CXX = @CXX@
CC = @CC@
MKDEP = ../../../conf/mkdep
@@ -48,16 +48,16 @@ install: setdest calcdest
$(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST)
setdest: rng.o setdest.o
- $(CC) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+ $(CXX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
$(LIBS)
calcdest: rng.o calcdest.o
- $(CC) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+ $(CXX) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
$(LIBS)
rng.o:
@rm -f $@
- $(CC) -c $(DEFINE) -o $@ ../../../rng.cc
+ $(CXX) -c $(DEFINE) -o $@ ../../../rng.cc
setbox: setbox.o
$(CC) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
@@ -68,5 +68,5 @@ clean:
.SUFFIXES: .cc
.cc.o:
- $(CCX) -c $(DEFINE) $(CFLAGS) -o $@ $*.cc
+ $(CXX) -c $(DEFINE) $(CFLAGS) -o $@ $*.cc

9
net/ns/patches/patch-indep-utils_webtrace-conv_dec_proxytrace_cc Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_proxytrace_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- indep-utils/webtrace-conv/dec/proxytrace.cc.orig Sun Sep 29 16:25:55 2002
+++ indep-utils/webtrace-conv/dec/proxytrace.cc Sun Sep 29 16:26:10 2002
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
#include "proxytrace.h"

12
net/ns/patches/patch-sfq_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sfq_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- sfq.cc.orig Sun Sep 29 13:57:10 2002
+++ sfq.cc Sun Sep 29 13:57:22 2002
@@ -49,7 +49,7 @@ class SFQ; // a set of SFQ queues
class PacketSFQ : public PacketQueue {
PacketSFQ() : pkts(0), prev(0), next(0) {}
- friend SFQ;
+ friend class SFQ;
protected:
void sfqdebug();
int pkts;

14
net/ns/patches/patch-snoop_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-snoop_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- snoop.h.orig Sun Sep 29 14:01:04 2002
+++ snoop.h Sun Sep 29 14:01:19 2002
@@ -111,8 +111,8 @@ class SnoopRxmitHandler;
class SnoopPersistHandler;
class Snoop : public NsObject {
- friend SnoopRxmitHandler;
- friend SnoopPersistHandler;
+ friend class SnoopRxmitHandler;
+ friend class SnoopPersistHandler;
public:
Snoop();
void recv(Packet *, Handler *);

12
net/ns/patches/patch-tcp-full_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tcp-full_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tcp-full.h.orig Sun Sep 29 13:55:58 2002
+++ tcp-full.h Sun Sep 29 13:56:23 2002
@@ -131,7 +131,7 @@ protected:
};
class FullTcpAgent : public TcpAgent {
- friend ReassemblyQueue;
+ friend class ReassemblyQueue;
public:
FullTcpAgent();
~FullTcpAgent();

21
net/ns/patches/patch-tcp-rbp_cc Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-tcp-rbp_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tcp-rbp.cc.orig Sun Sep 29 13:54:59 2002
+++ tcp-rbp.cc Sun Sep 29 13:55:32 2002
@@ -70,7 +70,7 @@ protected:
// Hmmm... ``a is a'' in the construction of the RBPVegasPaceTimer edifice :->
class RBPVegasTcpAgent : public virtual VegasTcpAgent {
- friend RBPVegasPaceTimer;
+ friend class RBPVegasPaceTimer;
public:
RBPVegasTcpAgent();
virtual void recv(Packet *pkt, Handler *);
@@ -232,7 +232,7 @@ protected:
// Hmmm... ``a is a'' in the construction of the RBPRenoPaceTimer edifice :->
class RBPRenoTcpAgent : public virtual RenoTcpAgent {
- friend RBPRenoPaceTimer;
+ friend class RBPRenoPaceTimer;
public:
RBPRenoTcpAgent();
virtual void recv(Packet *pkt, Handler *);

12
net/ns/patches/patch-tfrc-sink_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tfrc-sink_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tfrc-sink.h.orig Sun Sep 29 14:07:40 2002
+++ tfrc-sink.h Sun Sep 29 14:07:52 2002
@@ -63,7 +63,7 @@ protected:
};
class TfrcSinkAgent : public Agent {
- friend TfrcNackTimer;
+ friend class TfrcNackTimer;
public:
TfrcSinkAgent();
void recv(Packet*, Handler*);

14
net/ns/patches/patch-tfrc_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tfrc_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tfrc.h.orig Sun Sep 29 13:49:17 2002
+++ tfrc.h Sun Sep 29 13:49:30 2002
@@ -109,8 +109,8 @@ protected:
};
class TfrcAgent : public Agent {
- friend TfrcSendTimer;
- friend TfrcNoFeedbackTimer;
+ friend class TfrcSendTimer;
+ friend class TfrcNoFeedbackTimer;
public:
TfrcAgent();
void recv(Packet*, Handler*);