trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] trafficserver git commit: Revert "TS-3420 Remove duplication of TS_RES_MEM_PATH"
Date Mon, 02 Mar 2015 18:12:10 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 3f3667d10 -> 4cbbf2c8f


Revert "TS-3420 Remove duplication of TS_RES_MEM_PATH"

This reverts commit 90fa51d512698d33d31c16d31e9e17804b1d461f.

Conflicts:
	CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/21af9a2b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/21af9a2b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/21af9a2b

Branch: refs/heads/master
Commit: 21af9a2bfe0f76467c0c128507ede47b70c2f6e8
Parents: 3f3667d
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Mon Mar 2 10:58:31 2015 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Mon Mar 2 10:58:31 2015 -0700

----------------------------------------------------------------------
 lib/ts/apidefs.h.in        | 11 ++++-------
 mgmt/api/include/mgmtapi.h |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/21af9a2b/lib/ts/apidefs.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 2b8ed76..be3a580 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -83,19 +83,16 @@ 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)
-
+#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/")
 #define TS_MAX_USER_NAME_LEN 256
 
 #ifndef TS_DEPRECATED
 #define TS_DEPRECATED __attribute__ ((deprecated))
 #endif
 
-/* This is for memory debugging with TSmalloc() and family */
-#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/")
-
   /**
       The following struct is used by TSPluginRegister(). It stores
       registration information about the plugin.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/21af9a2b/mgmt/api/include/mgmtapi.h
----------------------------------------------------------------------
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 39155d6..a04bb11 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -30,7 +30,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <ts/apidefs.h>
 
 /***************************************************************************
  * System Specific Items
@@ -45,6 +44,10 @@ extern "C"
 {
 #endif                          /* __cplusplus */
 
+#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/")
 
 /***************************************************************************
  * Error and Return Values


Mime
View raw message