svn commit: r1220309 - in /trafficserver/traffic/trunk: lib/ts/Compatability.h proxy/logging/LogUtils.cc

[zwoop]

Author: zwoop
Date: Sun Dec 18 00:33:04 2011
New Revision: 1220309

URL: http://svn.apache.org/viewvc?rev=1220309&view=rev
Log:
TS-992 Fix compiling on Solaris again

Modified:
    trafficserver/traffic/trunk/lib/ts/Compatability.h
    trafficserver/traffic/trunk/proxy/logging/LogUtils.cc

Modified: trafficserver/traffic/trunk/lib/ts/Compatability.h
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Compatability.h?rev=1220309&r1=1220308&r2=1220309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Compatability.h (original)
+++ trafficserver/traffic/trunk/lib/ts/Compatability.h Sun Dec 18 00:33:04 2011
@@ -58,6 +58,9 @@ template<class T> T max(const T a, const
 #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
 #elif defined(darwin)
 #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
+#elif defined(solaris)
+#define NEED_ALTZONE_DEFINED
+#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED | MAP_NORESERVE)
 #else
 #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED | MAP_NORESERVE)
 #endif

Modified: trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc?rev=1220309&r1=1220308&r2=1220309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogUtils.cc Sun Dec 18 00:33:04 
2011
@@ -130,10 +130,11 @@ LogUtils::timestamp_to_netscape_str(long
 #endif
     struct tm res;
     struct tm *tms = ink_localtime_r((const time_t *) &timestamp, &res);
-#ifndef NEED_ALTZONE_DEFINED
-    long zone = -tms->tm_gmtoff;        // double negative!
-#else
+    // TODO: Not sure this makes sense, can altzone actually be != timezone ??
+#ifdef NEED_ALTZONE_DEFINED
     long zone = (tms->tm_isdst > 0) ? altzone : timezone;
+#else
+    long zone = -tms->tm_gmtoff;        // double negative!
 #endif
     int offset;
     char sign;
@@ -145,8 +146,7 @@ LogUtils::timestamp_to_netscape_str(long
       offset = zone / -60;
       sign = '+';
     }
-    int glen = snprintf(gmtstr, 16, "%c%.2d%.2d",
-                            sign, offset / 60, offset % 60);
+    int glen = snprintf(gmtstr, 16, "%c%.2d%.2d", sign, offset / 60, offset % 
60);
 
     strftime(timebuf, 64 - glen, "%d/%b/%Y:%H:%M:%S ", tms);
     ink_strlcat(timebuf, gmtstr, sizeof(timebuf));