Index: branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp
===================================================================
--- branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp	(nonexistent)
+++ branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp	(revision 560558)
@@ -0,0 +1,47 @@
+--- src/Settings.cpp.orig	2020-12-12 00:59:10 UTC
++++ src/Settings.cpp
+@@ -1054,7 +1054,7 @@ void Settings_ModalOptions (struct thread_Settings *mE
+ 	    bail = true;
+ 	} else if (isTxStartTime(mExtSettings) || isTxHoldback(mExtSettings)) {
+ 	    Timestamp now;
+-	    long nowsecs = now.getSecs();
++	    time_t nowsecs = now.getSecs();
+ 	    // fill out the formats in the event they are needed per an time error
+ 	    char start_timebuf[80];
+ 	    struct tm ts = *localtime(&mExtSettings->txstart_epoch.tv_sec);
+@@ -1731,13 +1731,13 @@ int Settings_GenerateClientHdr (struct thread_Settings
+ 	    if (isFullDuplex(client) || isReverse(client)) {
+ 		upperflags |= HEADER_ISOCH_SETTINGS;
+ 		hdr->isoch_settings.FPSl = htonl((long)(client->mFPS));
+-		hdr->isoch_settings.FPSu = htonl(((client->mFPS - (long)(client->mFPS)) * rMillion));
++		hdr->isoch_settings.FPSu = htonl((long)((client->mFPS - (long)(client->mFPS)) * rMillion));
+ 		hdr->isoch_settings.Meanl = htonl((long)(client->mMean));
+-		hdr->isoch_settings.Meanu = htonl((((client->mMean) - (long)(client->mMean)) * rMillion));
++		hdr->isoch_settings.Meanu = htonl((long)(((client->mMean) - (long)(client->mMean)) * rMillion));
+ 		hdr->isoch_settings.Variancel = htonl((long)(client->mVariance));
+-		hdr->isoch_settings.Varianceu = htonl(((client->mVariance - (long)(client->mVariance)) * rMillion));
++		hdr->isoch_settings.Varianceu = htonl((long)((client->mVariance - (long)(client->mVariance)) * rMillion));
+ 		hdr->isoch_settings.BurstIPGl = htonl((long)(client->mBurstIPG));
+-		hdr->isoch_settings.BurstIPGu = htonl(((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion));
++		hdr->isoch_settings.BurstIPGu = htonl((long)((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion));
+ 		len += sizeof(struct client_hdrext_isoch_settings);
+ 	    }
+ 	}
+@@ -1822,13 +1822,13 @@ int Settings_GenerateClientHdr (struct thread_Settings
+ 	    upperflags |= HEADER_ISOCH;
+ 	    if (isFullDuplex(client) || isReverse(client)) {
+ 		upperflags |= HEADER_ISOCH_SETTINGS;
+-		hdr->isoch_settings.FPSl = htonl(client->mFPS);
++		hdr->isoch_settings.FPSl = htonl((long)client->mFPS);
+ 		hdr->isoch_settings.FPSu = htonl(((long)(client->mFPS) - (long)client->mFPS * rMillion));
+-		hdr->isoch_settings.Meanl = htonl(client->mMean);
++		hdr->isoch_settings.Meanl = htonl((long)client->mMean);
+ 		hdr->isoch_settings.Meanu = htonl(((long)(client->mMean) - (long)client->mMean * rMillion));
+-		hdr->isoch_settings.Variancel = htonl(client->mVariance);
++		hdr->isoch_settings.Variancel = htonl((long)client->mVariance);
+ 		hdr->isoch_settings.Varianceu = htonl(((long)(client->mVariance) - (long)client->mVariance * rMillion));
+-		hdr->isoch_settings.BurstIPGl = htonl(client->mBurstIPG);
++		hdr->isoch_settings.BurstIPGl = htonl((long)client->mBurstIPG);
+ 		hdr->isoch_settings.BurstIPGu = htonl(((long)(client->mBurstIPG) - (long)client->mBurstIPG * rMillion));
+ 		len += sizeof(struct client_hdrext_isoch_settings);
+ 	    }

Property changes on: branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c
===================================================================
--- branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c	(nonexistent)
+++ branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c	(revision 560558)
@@ -0,0 +1,16 @@
+--- src/histogram.c.orig	2020-11-30 18:53:55 UTC
++++ src/histogram.c
+@@ -239,11 +239,11 @@ void histogram_print(struct histogram *h, double start
+       fprintf(stdout, "%s (%.2f/%.2f/99.7%%=%d/%d/%d,Outliers=%d,obl/obu=%d/%d)", \
+ 	      h->outbuf, h->ci_lower, h->ci_upper, lowerci, upperci, upper3stdev, outliercnt, oob_l, oob_u);
+     if (!h->final && (h->maxval > 0)) {
+-	fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->maxval * 1e3), h->maxts.tv_sec, (long) h->maxts.tv_usec);
++	fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->maxval * 1e3), (long) h->maxts.tv_sec, (long) h->maxts.tv_usec);
+       h->maxbin = -1;
+       h->maxval = 0;
+     } else if (h->final && (h->fmaxval > 0)) {
+-	fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->fmaxval * 1e3), h->fmaxts.tv_sec, (long) h->fmaxts.tv_usec);
++	fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->fmaxval * 1e3), (long) h->fmaxts.tv_sec, (long) h->fmaxts.tv_usec);
+     } else {
+       fprintf(stdout, "\n");
+     }

Property changes on: branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 560557)
+++ branches/2021Q1	(revision 560558)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r560244-560245