| 1 |
diff -ruN indi/src/apogee/ApogeeUsbLinux.cpp indi.new/src/apogee/ApogeeUsbLinux.cpp
|
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
|
2 |
--- 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
|
3 |
+++ indi.new/src/apogee/ApogeeUsbLinux.cpp 2007-10-13 12:15:14.000000000 +0200
|
| 4 |
@@ -21,7 +21,7 @@
|
4 |
@@ -21,7 +21,7 @@
|
| 5 |
//
|
5 |
//
|
| 6 |
|
6 |
|
| 7 |
#include <assert.h>
|
7 |
#include <assert.h>
|
| 8 |
-#include <sys/io.h>
|
8 |
-#include <sys/io.h>
|
| 9 |
+//#include <sys/io.h>
|
9 |
+//#include <sys/io.h>
|
| 10 |
#include <sys/time.h>
|
10 |
#include <sys/time.h>
|
| 11 |
#include <sys/resource.h>
|
11 |
#include <sys/resource.h>
|
| 12 |
#include <sys/ioctl.h>
|
12 |
#include <sys/ioctl.h>
|
| 13 |
diff -ruN indi/src/apogee/CameraIO_LinuxISA.cpp indi.new/src/apogee/CameraIO_LinuxISA.cpp
|
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
|
14 |
--- 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
|
15 |
+++ indi.new/src/apogee/CameraIO_LinuxISA.cpp 2007-10-13 12:11:04.000000000 +0200
|
| 16 |
@@ -22,7 +22,7 @@
|
16 |
@@ -22,7 +22,7 @@
|
| 17 |
//////////////////////////////////////////////////////////////////////
|
17 |
//////////////////////////////////////////////////////////////////////
|
| 18 |
|
18 |
|
| 19 |
#include <assert.h>
|
19 |
#include <assert.h>
|
| 20 |
-#include <sys/io.h>
|
20 |
-#include <sys/io.h>
|
| 21 |
+//#include <sys/io.h>
|
21 |
+//#include <sys/io.h>
|
| 22 |
#include <sys/time.h>
|
22 |
#include <sys/time.h>
|
| 23 |
#include <sys/resource.h>
|
23 |
#include <sys/resource.h>
|
| 24 |
#include <sys/ioctl.h>
|
24 |
#include <sys/ioctl.h>
|
| 25 |
diff -ruN indi/src/apogee/CameraIO_LinuxPCI.cpp indi.new/src/apogee/CameraIO_LinuxPCI.cpp
|
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
|
26 |
--- 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
|
27 |
+++ indi.new/src/apogee/CameraIO_LinuxPCI.cpp 2007-10-13 12:12:30.000000000 +0200
|
| 28 |
@@ -22,7 +22,7 @@
|
28 |
@@ -22,7 +22,7 @@
|
| 29 |
//////////////////////////////////////////////////////////////////////
|
29 |
//////////////////////////////////////////////////////////////////////
|
| 30 |
|
30 |
|
| 31 |
#include <assert.h>
|
31 |
#include <assert.h>
|
| 32 |
-#include <sys/io.h>
|
32 |
-#include <sys/io.h>
|
| 33 |
+//#include <sys/io.h>
|
33 |
+//#include <sys/io.h>
|
| 34 |
#include <sys/time.h>
|
34 |
#include <sys/time.h>
|
| 35 |
#include <sys/resource.h>
|
35 |
#include <sys/resource.h>
|
| 36 |
#include <sys/ioctl.h>
|
36 |
#include <sys/ioctl.h>
|
| 37 |
diff -ruN indi/src/indicom.c indi.new/src/indicom.c
|
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
|
38 |
--- 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
|
39 |
+++ indi.new/src/indicom.c 2007-10-13 12:25:38.000000000 +0200
|
| 40 |
@@ -236,10 +236,6 @@
|
40 |
@@ -236,10 +236,6 @@
|
| 41 |
#if defined(__GLIBC__) && (__GLIBC_MINOR__ >=1 && !defined(__UCLIBC__))
|
41 |
#if defined(__GLIBC__) && (__GLIBC_MINOR__ >=1 && !defined(__UCLIBC__))
|
| 42 |
/* GNU version */
|
42 |
/* GNU version */
|
| 43 |
sincos( DegToRad(Degrees), &Sin, &Cos );
|
43 |
sincos( DegToRad(Degrees), &Sin, &Cos );
|
| 44 |
- #else
|
44 |
- #else
|
| 45 |
- /* For older GLIBC versions */
|
45 |
- /* For older GLIBC versions */
|
| 46 |
- Sin = ::sin( DegToRad(Degrees) );
|
46 |
- Sin = ::sin( DegToRad(Degrees) );
|
| 47 |
- Cos = ::cos( DegToRad(Degrees) );
|
47 |
- Cos = ::cos( DegToRad(Degrees) );
|
| 48 |
#endif
|
48 |
#endif
|
| 49 |
#else
|
49 |
#else
|
| 50 |
/* ANSI-compliant version */
|
50 |
/* ANSI-compliant version */
|