Subversion Repositories svnkaklik

Rev

Rev 410 | Details | Compare with Previous | Last modification | View Log

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