You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/02/14 22:02:11 UTC
svn commit: r910073 - in /incubator/trafficserver/traffic/branches/dev: ./
configure.ac libinktomi++/ink_queue.cc libinktomi++/ink_queue_utils.c
librecords/RecCompatibility.cc proxy/cust_log_fmt_cnvrt.cc
Author: georgep
Date: Sun Feb 14 21:02:11 2010
New Revision: 910073
URL: http://svn.apache.org/viewvc?rev=910073&view=rev
Log:
TS-11: Fixes for using Sun Studio Compiler on 64-bit. Also incorporates changes from TS-124 and TS-126. Futher progress with Sun Studio Compiler can not be made due to TS-125.
Modified:
incubator/trafficserver/traffic/branches/dev/ (props changed)
incubator/trafficserver/traffic/branches/dev/configure.ac
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue_utils.c
incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc
incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 21:02:11 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-909679
+/incubator/trafficserver/traffic/trunk:891822-909852
Modified: incubator/trafficserver/traffic/branches/dev/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/configure.ac?rev=910073&r1=910072&r2=910073&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/dev/configure.ac Sun Feb 14 21:02:11 2010
@@ -401,10 +401,13 @@
;;
solaris*)
if test "x${base_cc}" = "xcc" ;then
- common_opt="-mt -m32 -D__WORDSIZE=32" # FIXME: This should be detected
+ common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: This should be detected
debug_opt="-g $common_opt"
release_opt="-g $common_opt -xO3"
cxx_opt="-library=stlport4 -erroff"
+ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS],1,
+ [posix thread semantics]
+ )
else # gcc
common_opt="-pipe -Wall -Werror -Wno-char-subscripts -Wno-write-strings"
debug_opt="-ggdb3 $common_opt"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_queue.cc?rev=910073&r1=910072&r2=910073&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue.cc Sun Feb 14 21:02:11 2010
@@ -36,6 +36,7 @@
****************************************************************************/
+#include "ink_config.h"
#include <assert.h>
#include <memory.h>
#include <stdlib.h>
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue_utils.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_queue_utils.c?rev=910073&r1=910072&r2=910073&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue_utils.c (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_queue_utils.c Sun Feb 14 21:02:11 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include <assert.h>
#include "ink_atomic.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc?rev=910073&r1=910072&r2=910073&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc Sun Feb 14 21:02:11 2010
@@ -176,8 +176,7 @@
// construct a path/filename for the pipe
#define SEPERATOR "/"
- int path_len = strlen(base_path) + strlen(SEPERATOR) + strlen(name);
- char path[(path_len + 1) * sizeof(char)];
+ char path[PATH_NAME_MAX];
snprintf(path, sizeof(path), "%s%s%s", base_path, SEPERATOR, name);
#undef SEPERATOR
if (strlen(path) > (sizeof(servaddr.sun_path) - 1)) {
@@ -243,8 +242,7 @@
// construct a path/filename for the pipe
#define SEPERATOR "/"
- int path_len = strlen(base_path) + strlen(SEPERATOR) + strlen(name);
- char path[(path_len + 1) * sizeof(char)];
+ char path[PATH_NAME_MAX];
snprintf(path, sizeof(path), "%s%s%s", base_path, SEPERATOR, name);
#undef SEPERATOR
if (strlen(path) > (sizeof(servaddr.sun_path) - 1)) {
Modified: incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc?rev=910073&r1=910072&r2=910073&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc Sun Feb 14 21:02:11 2010
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <errno.h>
//#include <iomanip.h>
-//#include <unistd.h>
+#include <unistd.h>
#include "SimpleTokenizer.h"
#include "ink_args.h"
#include "I_Version.h"