summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch')
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
new file mode 100644
index 000000000000..473243f2ec15
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
@@ -0,0 +1,29 @@
+--- xoscope-2.0/proscope.c
++++ xoscope-2.0/proscope.c
+@@ -11,6 +11,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include "proscope.h"
+ #include "oscope.h"
+--- xoscope-2.0/oscope.c
++++ xoscope-2.0/oscope.c
+@@ -408,7 +408,15 @@
+ */
+
+ displayed_samples = p->signal ? samples(p->signal->rate) : 0;
+- max_samples = p->signal ? max(samples(p->signal->rate), p->signal->num) : 0;
++ if ( p->signal ) {
++ if ( samples(p->signal->rate) > p->signal->num ) {
++ max_samples = samples(p->signal->rate);
++ } else {
++ max_samples = p->signal->num;
++ }
++ } else {
++ max_samples = 0;
++ }
+
+ if (c >= 'A' && c <= 'Z') {
+ if (p->signal) {