summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-04-10 18:09:21 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-04-10 18:09:21 +0000
commit6067b47def2e889264d191d27ae31e84be97f577 (patch)
tree190db3c6031f4ce7e18e97c22f07e5fb75efa77d
parent9e2424c48db2b616e568168615b92bb2ac78ee74 (diff)
downloadATCD-6067b47def2e889264d191d27ae31e84be97f577.tar.gz
Sun Apr 10 18:04:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-qnx.h: Don't define _QNX_SOURCE, already defined by default
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/NEWS2
-rw-r--r--ACE/ace/config-qnx.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 94faaa51e1d..a3b28c052fc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 10 18:04:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-qnx.h:
+ Don't define _QNX_SOURCE, already defined by default
+
Sun Apr 10 17:32:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-qnx.h:
diff --git a/ACE/NEWS b/ACE/NEWS
index 8fd0e507bdd..095f83e1d8a 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -7,6 +7,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.0.1 and ACE-6.0.2
ace/OS_NS_*.h files; however, you should be able to build OS.h-including
code without needing to replace it with OS_NS_* includes.
+. Improved and simplified QNX support
+
USER VISIBLE CHANGES BETWEEN ACE-6.0.0 and ACE-6.0.1
====================================================
diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h
index d37940b9a93..940525d3709 100644
--- a/ACE/ace/config-qnx.h
+++ b/ACE/ace/config-qnx.h
@@ -15,7 +15,6 @@
#endif
#define _POSIX_C_SOURCE 199506
-#define _QNX_SOURCE
// The following defines the Neutrino compiler.
// gcc should know to call g++ as necessary