summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstallions <stallions@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-10-30 18:47:41 +0000
committerstallions <stallions@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-10-30 18:47:41 +0000
commitd4ff63a4f3940ffb05af485333e228712de28116 (patch)
tree318c0c1aa231c084a824ed6581c64515c2aa5b96
parentf9c3727738c49db0f7e913b4743ebfd11733cd0c (diff)
downloadATCD-d4ff63a4f3940ffb05af485333e228712de28116.tar.gz
ChangeLogTag: Fri Oct 30 18:46:03 UTC 2009 Steven Stallion <stallions@ociweb.com>
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/include/makeinclude/wrapper_macros.GNU6
2 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c44e1f00202..9e8079b2fe0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 30 18:46:03 UTC 2009 Steven Stallion <stallions@ociweb.com>
+
+ * include/makeinclude/wrapper_macros.GNU:
+
+ Added -DNDEBUG to CPPFLAGS when debug=0 is set.
+
Thu Oct 29 21:45:30 UTC 2009 Olli Savia <ops@iki.fi>
* ace/OS_NS_pwd.h:
@@ -8,7 +14,7 @@ Thu Oct 29 21:45:30 UTC 2009 Olli Savia <ops@iki.fi>
* ace/os_include/os_time.h:
* configure.ac:
* m4/config_h.m4:
- Removed references to ACE_HAS_BROKEN_CTIME and
+ Removed references to ACE_HAS_BROKEN_CTIME and
ACE_HAS_BROKEN_R_ROUTINES.
Thu Oct 29 21:25:49 UTC 2009 Chris Cleeland <cleeland@ociweb.com>
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 28486ccd198..9cc8aedf8a8 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -266,11 +266,15 @@ endif
INCLDIRS ?=
DEFFLAGS ?=
+ifeq ($(debug),0)
+ DEFFLAGS += -DNDEBUG
+endif
+
ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
INCLDIRS += -I$(ACE_ROOT)
endif
-CPPFLAGS += $(DEFFLAGS) $(INCLDIRS)
+CPPFLAGS += $(DEFFLAGS) $(INCLDIRS)
# Define default extensions for IDL-generated files
IDL_CLIENT_HDR_EXT ?= C.h