1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/MeterMaker.cc xosview-1.8.3/linux/MeterMaker.cc
--- xosview-1.8.3.vanilla/linux/MeterMaker.cc 2007-01-28 20:09:28.000000000 +0100
+++ xosview-1.8.3/linux/MeterMaker.cc 2007-01-28 20:19:04.000000000 +0100
@@ -76,10 +76,12 @@
#if defined (__arm__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__s390__) || defined(__s390x__)
/* these architectures have no ioperm() */
#else
+ /*
for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
if (_xos->isResourceTrue(SerialMeter::getResourceName(
(SerialMeter::Device)i)))
push(new SerialMeter(_xos, (SerialMeter::Device)i));
+ */
#endif
// check for the interrupt meter
diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/serialmeter.cc xosview-1.8.3/linux/serialmeter.cc
--- xosview-1.8.3.vanilla/linux/serialmeter.cc 2007-01-28 20:09:28.000000000 +0100
+++ xosview-1.8.3/linux/serialmeter.cc 2007-01-28 20:18:08.000000000 +0100
@@ -10,6 +10,7 @@
//
// In order to use this new serial meter, xosview needs to be suid root.
//
+/*
#include "serialmeter.h"
#include "xosview.h"
#include <fcntl.h>
@@ -154,4 +155,4 @@
}
return 0;
-}
+}*/
diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.cc xosview-1.8.3/snprintf.cc
--- xosview-1.8.3.vanilla/snprintf.cc 2007-01-28 20:09:28.000000000 +0100
+++ xosview-1.8.3/snprintf.cc 2007-01-28 20:18:47.000000000 +0100
@@ -1,11 +1,11 @@
#ifndef HAVE_SNPRINTF
+/*
#include <stdarg.h>
#include <stdio.h>
extern "C" int snprintf ( char *str, int n, const char *format, ...)
{
- /* punt the warning */
n++;
va_list ap;
va_start(ap, format);
@@ -13,5 +13,6 @@
va_end(ap);
return rval;
}
+*/
#endif
diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.h xosview-1.8.3/snprintf.h
--- xosview-1.8.3.vanilla/snprintf.h 2007-01-28 20:09:28.000000000 +0100
+++ xosview-1.8.3/snprintf.h 2007-01-28 20:18:20.000000000 +0100
@@ -1,10 +1,12 @@
#ifndef snprintf_h
#define snprintf_h
+/*
#ifndef HAVE_SNPRINTF
extern "C" int snprintf ( char *str, int n, const char *format, ...);
#else
#include <stdio.h>
#endif
+*/
#endif
|
GitWeb
