[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-02-17 9:12:08
Message-ID: 20050217091208.61F741D21C () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Seems more OSsen than Linux (ie. Solaris in non-POSIX mode) have timezone as an int


  M +12 -0     configure.in.in   1.14
  M +4 -2      kstars/kstars/indi/lx200generic.cpp   1.48


--- kdeedu/configure.in.in  #1.13:1.14
@@ -4,4 +4,16 @@
 AC_CHECK_UNSETENV
 
+timezone_int=no
+AC_TRY_COMPILE(
+        #include <time.h>
+        ,
+        daylight = 0;
+        timezone = 0;
+        ,
+        AC_DEFINE(TIMEZONE_IS_INT,1,[The symbol timezone is an int, not a function])
+        ,
+        AC_DEFINE(TIMEZONE_IS_INT,0,[The symbol timezone is an int, not a function])
+        )
+
 # KStars INDI driver for the FLI CCD
 case "${host_os}" in

--- kdeedu/kstars/kstars/indi/lx200generic.cpp  #1.47:1.48
@@ -19,4 +19,6 @@
 #endif
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,5 +41,5 @@
 
 
-#ifndef __linux__
+#if TIMEZONE_IS_INT
 static int daylight = 0;
 #endif
@@ -50,5 +52,5 @@ static inline double timezoneOffset()
 ** are different: CET is -3600 in Linux and +3600 elsewhere.
 */
-#ifdef __linux__
+#if TIMEZONE_IS_INT
   return timezone / (60 * 60);
 #else


[prev in list] [next in list] [prev in thread] [next in thread]