You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/03/02 19:12:11 UTC
[2/2] trafficserver git commit: TS-3420 Simpler and functional fixes,
but not clean, for redefining mem debugging symbols
TS-3420 Simpler and functional fixes, but not clean, for redefining mem debugging symbols
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4cbbf2c8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4cbbf2c8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4cbbf2c8
Branch: refs/heads/master
Commit: 4cbbf2c8ff930b45cd18e30d226f9a17a73b1e5b
Parents: 21af9a2
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Mar 2 11:05:58 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Mar 2 11:05:58 2015 -0700
----------------------------------------------------------------------
lib/ts/apidefs.h.in | 4 ++++
mgmt/api/include/mgmtapi.h | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4cbbf2c8/lib/ts/apidefs.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index be3a580..329adf2 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -83,10 +83,14 @@ extern "C"
#define TS_HTTP_VERSION(a,b) ((((a) & 0xFFFF) << 16) | ((b) & 0xFFFF))
#define TS_HTTP_MINOR(v) ((v) & 0xFFFF)
#define TS_HTTP_MAJOR(v) (((v) >> 16) & 0xFFFF)
+
+#ifndef TS_RES_MEM_PATH
#define __TS_RES_PATH(x) #x
#define _TS_RES_PATH(x) __TS_RES_PATH (x)
#define TS_RES_PATH(x) x __FILE__ ":" _TS_RES_PATH (__LINE__)
#define TS_RES_MEM_PATH TS_RES_PATH ("memory/")
+#endif
+
#define TS_MAX_USER_NAME_LEN 256
#ifndef TS_DEPRECATED
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4cbbf2c8/mgmt/api/include/mgmtapi.h
----------------------------------------------------------------------
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index a04bb11..156e5b2 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -44,10 +44,12 @@ extern "C"
{
#endif /* __cplusplus */
+#ifndef TS_RES_MEM_PATH
#define __TS_RES_PATH(x) #x
#define _TS_RES_PATH(x) __TS_RES_PATH (x)
#define TS_RES_PATH(x) x __FILE__ ":" _TS_RES_PATH (__LINE__)
#define TS_RES_MEM_PATH TS_RES_PATH ("memory/")
+#endif
/***************************************************************************
* Error and Return Values