You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by je...@apache.org on 2010/11/13 16:50:46 UTC
svn commit: r1034783 - in /trafficserver/traffic/trunk/libinktomi++:
ink_queue.h ink_queue_utils.cc
Author: jesus
Date: Sat Nov 13 15:50:46 2010
New Revision: 1034783
URL: http://svn.apache.org/viewvc?rev=1034783&view=rev
Log:
TS-533 ARM needs to sue the i386 version of the ink_queue stuff
Modified:
trafficserver/traffic/trunk/libinktomi++/ink_queue.h
trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc
Modified: trafficserver/traffic/trunk/libinktomi++/ink_queue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue.h?rev=1034783&r1=1034782&r2=1034783&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_queue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_queue.h Sat Nov 13 15:50:46 2010
@@ -74,7 +74,7 @@ extern "C"
typedef union
{
-#if defined(__i386__)
+#if (defined(__i386__) || defined(__arm__)) && (SIZEOF_VOIDP == 4)
struct
{
void *pointer;
@@ -104,7 +104,7 @@ extern "C"
#define TO_PTR(_x) ((void*)(_x))
#endif
-#if defined(__i386__) || defined(__i386)
+#if (defined(__i386__) || defined(__arm__)) && (SIZEOF_VOIDP == 4)
#define FREELIST_POINTER(_x) (_x).s.pointer
#define FREELIST_VERSION(_x) (_x).s.version
#define SET_FREELIST_POINTER_VERSION(_x,_p,_v) \
Modified: trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue_utils.cc?rev=1034783&r1=1034782&r2=1034783&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc Sat Nov 13 15:50:46 2010
@@ -69,7 +69,7 @@
void
ink_queue_load_64(void *dst, void *src)
{
-#if defined(__i386__)
+#if (defined(__i386__) || defined(__arm__)) && (SIZEOF_VOIDP == 4)
int32 src_version = (*(head_p *) src).s.version;
void *src_pointer = (*(head_p *) src).s.pointer;