summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2005-02-16 16:16:54 +0000
committerOlli Savia <ops@iki.fi>2005-02-16 16:16:54 +0000
commit366e80bf23eb7456119074506927f29c959ccae5 (patch)
tree5790c6f12ed46c88cac57b0d6882d4fbcd0e90e3
parent8eeb4b414ace07a998a919e005024e47b69d8b34 (diff)
downloadATCD-366e80bf23eb7456119074506927f29c959ccae5.tar.gz
ChangeLogTag: Wed Feb 16 18:15:07 2005 Olli Savia <ops@iki.fi>
-rw-r--r--ChangeLog21
-rw-r--r--include/makeinclude/platform_lynxos.GNU4
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d900bac58db..70cfb546c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,24 @@
+Wed Feb 16 18:15:07 2005 Olli Savia <ops@iki.fi>
+
+ * include/makeinclude/platform_lynxos.GNU:
+ Fixed setting of ACE_LYNXOS_MAJOR and ACE_LYNXOS_MINOR.
+
Wed Feb 16 11:04:29 2005 Steve Huston <shuston@riverace.com>
- * ace/SSL/SSL_Asynch_Stream.cpp: Corrections to use ACE_Handler::Proxy
- instead of naked ACE_Handler pointers/references.
+ * ace/SSL/SSL_Asynch_Stream.cpp: Corrections to use ACE_Handler::Proxy
+ instead of naked ACE_Handler pointers/references.
Wed Feb 16 10:19:19 2005 Steve Huston <shuston@riverace.com>
- * ace/Asynch_IO.h: Remove the extraneous ACE_Handler:: qualification
- of Proxy_Ptr used inside ACE_Handler. This confused MSVC 6.
+ * ace/Asynch_IO.h: Remove the extraneous ACE_Handler:: qualification
+ of Proxy_Ptr used inside ACE_Handler. This confused MSVC 6.
Wed Feb 16 10:13:41 2005 Steve Huston <shuston@riverace.com>
- * examples/Reactor/Proactor/post_completions.cpp:
- * examples/Reactor/Proactor/test_proactor.cpp: Adjust the overridden
- result class and internal proactor calls to pass handler's proxy
- pointer, not the handler itself.
+ * examples/Reactor/Proactor/post_completions.cpp:
+ * examples/Reactor/Proactor/test_proactor.cpp: Adjust the overridden
+ result class and internal proactor calls to pass handler's proxy
+ pointer, not the handler itself.
Wed Feb 16 07:02:15 2005 Chad Elliott <elliott_c@ociweb.com>
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 81f7c1f7e4e..4259f0c2dfc 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -78,8 +78,8 @@ $(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/bin:$(ENV_PREFIX)/cdk/$
endif # PATH
endif # ! LynxOS
-LYNXOS_MAJOR = $(shell uname -r | awk -F. '{print $$1;}')
-LYNXOS_MINOR = $(shell uname -r | awk -F. '{print $$2;}')
+LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}')
+LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}')
PLATFORM_XT_CPPFLAGS=
PLATFORM_XT_LIBS=-lXm -lXt