You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/26 14:20:53 UTC
svn commit: r948406 - in /trafficserver/traffic/trunk: configure.ac
libinktomi++/Makefile.am libinktomi++/ink_config.h.in
libinktomi++/ink_port.h libinktomi++/inktomi++.h libinktomi++/ptrdef.h
proxy/hdrs/HdrHeap.cc
Author: mturk
Date: Wed May 26 12:20:52 2010
New Revision: 948406
URL: http://svn.apache.org/viewvc?rev=948406&view=rev
Log:
TS-235: Axe ptrdef.h and move int_pointer typdef to ink_port.h
Removed:
trafficserver/traffic/trunk/libinktomi++/ptrdef.h
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/libinktomi++/Makefile.am
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/libinktomi++/ink_port.h
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Wed May 26 12:20:52 2010
@@ -458,10 +458,10 @@ SHARED_CXXLINKFLAGS=-shared
dnl Checks for pointer size
AC_CHECK_SIZEOF(void*, 4)
-
if test "x$ac_cv_sizeof_voidp" == "x"; then
AC_ERROR([Cannot determine size of void*])
fi
+AC_SUBST(ac_cv_sizeof_voidp)
#
# Here are all the extra linux-specific C(XX)FLAGS additions and
Modified: trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ trafficserver/traffic/trunk/libinktomi++/Makefile.am Wed May 26 12:20:52 2010
@@ -126,7 +126,6 @@ libinktomi___a_SOURCES = \
MMH.cc \
MMH.h \
ParseRules.h \
- ptrdef.h \
Ptr.h \
RawHashTable.cc \
RawHashTable.h \
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Wed May 26 12:20:52 2010
@@ -112,6 +112,7 @@
#define GETHOSTBYNAME_R_HOSTENT_DATA @gethostbyname_r_hostent_data@
#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
#define NEED_UNION_SEMUN @need_union_semun@
+#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
/* API */
#define ATS_IS_MICRO_BUILD @is_micro_build@
Modified: trafficserver/traffic/trunk/libinktomi++/ink_port.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_port.h?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_port.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_port.h Wed May 26 12:20:52 2010
@@ -32,6 +32,7 @@
#if !defined (_ink_port_h_)
#define _ink_port_h_
+#include "ink_config.h"
#include <stdio.h>
#include <sys/types.h>
#include <stdint.h>
@@ -45,6 +46,16 @@ typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
+#if (SIZEOF_VOID_POINTER == 8) || (SIZEOF_VOID_POINTER == 4)
+#if (SIZEOF_VOID_POINTER == 8)
+typedef long long int_pointer;
+#else
+typedef unsigned long int_pointer;
+#endif
+#else
+#error "Invalid pointer size"
+#endif
+
#ifndef INT64_MIN
#define INTU64_MAX (18446744073709551615ULL)
#define INT64_MAX (9223372036854775807LL)
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Wed May 26 12:20:52 2010
@@ -105,6 +105,5 @@
#include "Regression.h"
#include "HostLookup.h"
#include "InkErrno.h"
-#include "ptrdef.h"
#endif /*_inktomiplus_h_*/
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc?rev=948406&r1=948405&r2=948406&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc Wed May 26 12:20:52 2010
@@ -35,7 +35,6 @@
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
-#include "ptrdef.h"
#define HDR_MAX_ALLOC_SIZE (HDR_HEAP_DEFAULT_SIZE - sizeof(HdrHeap))
#define HDR_HEAP_HDR_SIZE ROUND(sizeof(HdrHeap), HDR_PTR_SIZE)