summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2008-06-04 22:48:08 +0000
committerSteve Huston <shuston@riverace.com>2008-06-04 22:48:08 +0000
commit302d3b2873e4a00f4b9a06f4f949c7a5c895876b (patch)
treeb1e87d7548680a5668b0d769f59d898df242d8ec
parent25ba3700f75e719bd254705e477dc4a47cb17a7f (diff)
downloadATCD-302d3b2873e4a00f4b9a06f4f949c7a5c895876b.tar.gz
ChangeLogTag:Wed Jun 4 22:45:20 2008 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/ace/config-pharlap.h4
2 files changed, 14 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 15e040d29f9..66b8b766d4b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jun 4 22:45:20 2008 Steve Huston <shuston@riverace.com>
+
+ * ace/config-pharlap.h: Added ACE_LACKS_FILELLOCKS. My changes from
+ Mon Apr 28 21:53:23 UTC 2008 Steve Huston <shuston@riverace.com>
+ exposed a call to LockFileEx, which is not present on Pharlap
+ (and, therefore, not present in LabVIEW RT). The alternate API,
+ LockFile, is present on Pharlap but documented as unsupported.
+ Since the OS doesn't do multiple processes, there are more effective
+ ways to synchronize that file locks anyway.
+
Wed Jun 4 20:59:16 UTC 2008 Ciju John <johnc at ociweb dot com>
* ace/SSL/SSL_Context.cpp:
diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h
index 83d2eb9b5b0..9df14fd9d96 100644
--- a/ACE/ace/config-pharlap.h
+++ b/ACE/ace/config-pharlap.h
@@ -69,6 +69,10 @@
#undef ACE_HAS_INTERLOCKED_EXCHANGEADD
#undef ACE_HAS_WCHAR
+// PharLap's exports apparantly define LockFile, but it's documented as
+// unsupported. LockFileEx is not present.
+#define ACE_LACKS_FILELOCKS
+
#include /**/ <embkern.h>
#if defined (ACE_HAS_PHARLAP_RT)
# include /**/ <embtcpip.h>