Subversion Repositories svnkaklik

Rev

Rev 410 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 410 Rev 497
Line 1... Line -...
1
diff -ruN indi/src/apogee/ApogeeUsbLinux.cpp indi.new/src/apogee/ApogeeUsbLinux.cpp
-
 
2
--- indi/src/apogee/ApogeeUsbLinux.cpp	2007-04-15 21:14:46.000000000 +0200
1
--- indi/src/apogee/ApogeeUsbLinux.cpp	2007-04-15 21:14:46.000000000 +0200
3
+++ indi.new/src/apogee/ApogeeUsbLinux.cpp	2007-10-13 12:15:14.000000000 +0200
2
+++ indi.new/src/apogee/ApogeeUsbLinux.cpp	2007-10-13 12:15:14.000000000 +0200
4
@@ -21,7 +21,7 @@
3
@@ -21,7 +21,7 @@
5
 //
4
 //
6
 
5
 
Line 8... Line 7...
8
-#include <sys/io.h>
7
-#include <sys/io.h>
9
+//#include <sys/io.h>
8
+//#include <sys/io.h>
10
 #include <sys/time.h>                                                           
9
 #include <sys/time.h>                                                           
11
 #include <sys/resource.h>
10
 #include <sys/resource.h>
12
 #include <sys/ioctl.h>
11
 #include <sys/ioctl.h>
13
diff -ruN indi/src/apogee/CameraIO_LinuxISA.cpp indi.new/src/apogee/CameraIO_LinuxISA.cpp
-
 
14
--- indi/src/apogee/CameraIO_LinuxISA.cpp	2007-04-15 21:14:46.000000000 +0200
12
--- indi/src/apogee/CameraIO_LinuxISA.cpp	2007-04-15 21:14:46.000000000 +0200
15
+++ indi.new/src/apogee/CameraIO_LinuxISA.cpp	2007-10-13 12:11:04.000000000 +0200
13
+++ indi.new/src/apogee/CameraIO_LinuxISA.cpp	2007-10-13 12:11:04.000000000 +0200
16
@@ -22,7 +22,7 @@
14
@@ -22,7 +22,7 @@
17
 //////////////////////////////////////////////////////////////////////
15
 //////////////////////////////////////////////////////////////////////
18
 
16
 
Line 20... Line 18...
20
-#include <sys/io.h>                                                           
18
-#include <sys/io.h>                                                           
21
+//#include <sys/io.h>                                                           
19
+//#include <sys/io.h>                                                           
22
 #include <sys/time.h>                                                           
20
 #include <sys/time.h>                                                           
23
 #include <sys/resource.h>                                                           
21
 #include <sys/resource.h>                                                           
24
 #include <sys/ioctl.h>
22
 #include <sys/ioctl.h>
25
diff -ruN indi/src/apogee/CameraIO_LinuxPCI.cpp indi.new/src/apogee/CameraIO_LinuxPCI.cpp
-
 
26
--- indi/src/apogee/CameraIO_LinuxPCI.cpp	2007-04-15 21:14:46.000000000 +0200
23
--- indi/src/apogee/CameraIO_LinuxPCI.cpp	2007-04-15 21:14:46.000000000 +0200
27
+++ indi.new/src/apogee/CameraIO_LinuxPCI.cpp	2007-10-13 12:12:30.000000000 +0200
24
+++ indi.new/src/apogee/CameraIO_LinuxPCI.cpp	2007-10-13 12:12:30.000000000 +0200
28
@@ -22,7 +22,7 @@
25
@@ -22,7 +22,7 @@
29
 //////////////////////////////////////////////////////////////////////
26
 //////////////////////////////////////////////////////////////////////
30
 
27
 
Line 32... Line 29...
32
-#include <sys/io.h>                                                           
29
-#include <sys/io.h>                                                           
33
+//#include <sys/io.h>                                                           
30
+//#include <sys/io.h>                                                           
34
 #include <sys/time.h>                                                           
31
 #include <sys/time.h>                                                           
35
 #include <sys/resource.h>                                                           
32
 #include <sys/resource.h>                                                           
36
 #include <sys/ioctl.h>
33
 #include <sys/ioctl.h>
37
diff -ruN indi/src/indicom.c indi.new/src/indicom.c
-
 
38
--- indi/src/indicom.c	2007-04-15 23:06:20.000000000 +0200
34
--- indi/src/indicom.c	2007-04-15 23:06:20.000000000 +0200
39
+++ indi.new/src/indicom.c	2007-10-13 12:25:38.000000000 +0200
35
+++ indi.new/src/indicom.c	2007-10-13 12:25:38.000000000 +0200
40
@@ -236,10 +236,6 @@
36
@@ -236,10 +236,6 @@
41
                 #if defined(__GLIBC__) && (__GLIBC_MINOR__ >=1   && !defined(__UCLIBC__))
37
                 #if defined(__GLIBC__) && (__GLIBC_MINOR__ >=1   && !defined(__UCLIBC__))
42
 		/* GNU version */
38
 		/* GNU version */