Repository: trafficserver
Updated Branches:
refs/heads/4.2.x 311e1152d -> de2f11742
TS-2859: remove DBG macros to not generate warnings from GCC 4.9
(cherry picked from commit e7586dfee7a04b44e3c378a484cc1e776e847b27)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/54869408
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/54869408
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/54869408
Branch: refs/heads/4.2.x
Commit: 548694089763c985761463edce4d31882e06e48a
Parents: 311e115
Author: Marcin Juszkiewicz <[email protected]>
Authored: Thu May 29 12:15:43 2014 -0700
Committer: Phil Sorber <[email protected]>
Committed: Tue Jul 15 21:46:20 2014 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/ink_defs.h | 22 ----------------------
2 files changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54869408/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e601615..5231d41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.2
+ *) [TS-2859] Remove DBG macros to not generate warnings from GCC 4.9.
+
*) [TS-2560] regex_remap lowercase substitutions is not being initialized in
the construtor
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54869408/lib/ts/ink_defs.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_defs.h b/lib/ts/ink_defs.h
index b5e8122..ad728a5 100644
--- a/lib/ts/ink_defs.h
+++ b/lib/ts/ink_defs.h
@@ -131,28 +131,6 @@ countof(const T (&)[N]) {
#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
#endif
-/* Debugging
-*/
-#ifdef NDEBUG
-
-#define FDBG
-#define DBG(s)
-#define DBG1(s,a)
-#define DBG2(s,a1,a2)
-#define DBG3(s,a1,a2,a3)
-#define DBG4(s,a1,a2,a3,a4)
-
-#else
-
-#define FDBG if (debug_level==1) printf("debug "__FILE__":%d %s
: entered\n" ,__LINE__,__FUNCTION__)
-#define DBG(s) if (debug_level==1) printf("debug "__FILE__":%d %s
:" s ,__LINE__,__FUNCTION__)
-#define DBG1(s,a) if (debug_level==1) printf("debug "__FILE__":%d %s
:" s ,__LINE__,__FUNCTION__, a)
-#define DBG2(s,a1,a2) if (debug_level==1) printf("debug "__FILE__":%d %s
:" s ,__LINE__,__FUNCTION__, a1,a2)
-#define DBG3(s,a1,a2,a3) if (debug_level==1) printf("debug "__FILE__":%d %s
:" s ,__LINE__,__FUNCTION__, a1,a2,a3)
-#define DBG4(s,a1,a2,a3,a4) if (debug_level==1) printf("debug "__FILE__":%d %s
:" s ,__LINE__,__FUNCTION__, a1,a2,a3,a4)
-
-#endif
-
/* Types
*/
typedef void *(*VPVP_PFN) (void *);
