summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-12 20:35:44 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-12 20:35:44 +0000
commita0cb26098561a9ec10aa0539109ecf685e064a8e (patch)
treece255e96241a905c479bba980ced9fb4fe0e0242 /include
parent2edc3246fb1365874a85dd6f61443e8eaaf75de0 (diff)
downloadATCD-a0cb26098561a9ec10aa0539109ecf685e064a8e.tar.gz
ChangeLogTag: Mon Jul 12 15:27:37 1999 David L. Levine <levine@cs.wustl.edu>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_osf1_cxx.GNU10
-rw-r--r--include/makeinclude/platform_tru64_cxx.GNU10
2 files changed, 16 insertions, 4 deletions
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
index 285499f3454..6c2eb6eb8a8 100644
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ b/include/makeinclude/platform_osf1_cxx.GNU
@@ -13,7 +13,13 @@ ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
else # ! 3.x
ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
- CFLAGS += -DDIGITAL_UNIX=4
+
+ ifeq (4.0f,$(findstring 4.,$(shell /usr/sbin/sizer -v)))
+ CFLAGS += -DDIGITAL_UNIX=0x4F
+ else # ! 4.0F
+ CFLAGS += -DDIGITAL_UNIX=0x40
+ endif # ! 4.0F
+
ifneq ($(CXX_VER),CXX_5)
# 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
WARNING_FLAGS += -msg_disable 9
@@ -22,7 +28,7 @@ ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
else # ! 4.x
ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
- CFLAGS += -DDIGITAL_UNIX=5
+ CFLAGS += -DDIGITAL_UNIX=0x50
SOFLAGS = -shared -use_ld_input $(ACELIB)
endif # 5.x
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index 285499f3454..6c2eb6eb8a8 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -13,7 +13,13 @@ ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
else # ! 3.x
ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
- CFLAGS += -DDIGITAL_UNIX=4
+
+ ifeq (4.0f,$(findstring 4.,$(shell /usr/sbin/sizer -v)))
+ CFLAGS += -DDIGITAL_UNIX=0x4F
+ else # ! 4.0F
+ CFLAGS += -DDIGITAL_UNIX=0x40
+ endif # ! 4.0F
+
ifneq ($(CXX_VER),CXX_5)
# 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
WARNING_FLAGS += -msg_disable 9
@@ -22,7 +28,7 @@ ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
else # ! 4.x
ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
- CFLAGS += -DDIGITAL_UNIX=5
+ CFLAGS += -DDIGITAL_UNIX=0x50
SOFLAGS = -shared -use_ld_input $(ACELIB)
endif # 5.x