diff options
| -rw-r--r-- | ChangeLog-97b | 3 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | ace/config-unixware-2.01-g++.h | 1 | ||||
| -rw-r--r-- | ace/config-unixware-2.1.2-g++.h | 10 | ||||
| -rw-r--r-- | include/makeinclude/platform_unixware_g++.GNU | 5 |
5 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 140cdf4a2c3..dda0d160bad 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,5 +1,8 @@ Sat Nov 8 15:46:30 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + * Added a number of minor fixes for UNIXWARE with G++. Thanks to + Michael Rueger <m_rueger@syscomp.de> for reporting these. + * ace/Thread_Manager.h: Both Irix5 and VxWorks have problems with local typedefs with GCC. Thanks to Laura Paterno <lpaterno@d0chb.fnal.gov> for reporting this. @@ -3039,7 +3039,7 @@ typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontex #if defined (ACE_REDEFINES_XTI_FUNCTIONS) #include /**/ <xti.h> -#if defined (UNIXWARE) /* They apparantly forgot one... */ +#if defined (UNIXWARE_2_0) /* They apparantly forgot one... */ extern "C" int _xti_error(char *); #endif /* UNIXWARE */ #endif /* ACE_REDEFINES_XTI_FUNCTIONS */ diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h index c645ba503fe..38b59b95cb6 100644 --- a/ace/config-unixware-2.01-g++.h +++ b/ace/config-unixware-2.01-g++.h @@ -80,6 +80,7 @@ // Compiling for UNIXWARE #if !defined (UNIXWARE) #define UNIXWARE +#define UNIXARE_2_0 #endif /* UNIXWARE */ // These seem to be missing... Process_Manager uses them diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h index 3900300ae00..50bc98f3499 100644 --- a/ace/config-unixware-2.1.2-g++.h +++ b/ace/config-unixware-2.1.2-g++.h @@ -14,14 +14,15 @@ #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT #define ACE_NEEDS_SYSTIME_H -#define ACE_HAS_UALARM +// ualarm is only in BSD compatibility lib, but no header is provided +// #define ACE_HAS_UALARM #define ACE_HAS_SIZET_SOCKET_LEN #define ACE_HAS_AUTOMATIC_INIT_FINI #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_GNU_CSTRING_H #define ACE_HAS_STRING_CLASS #define ACE_HAS_MSG -#define ACE_HAS_SVR4_GETTIMEOFDAY +#define ACE_HAS_OSF1_GETTIMEOFDAY #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R #define ACE_HAS_MT_SAFE_SOCKETS #define ACE_HAS_NONCONST_GETBY @@ -79,6 +80,11 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#if ! defined (UNIXWARE) +#define UNIXWARE +#define UNIXWARE_2_1 +#endif /* ! UNIXWARE */ + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index 61ba91b2b2b..e5e76d03a98 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -6,12 +6,11 @@ debug = 1 CC = gcc CXX = g++ -CFLAGS += -I/usr/include -D__STDC__=0 #-w -CCFLAGS += $(CFLAGS) -fno-implicit-templates # -fno-strict-prototypes +CFLAGS += -D__STDC__=0 +CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) LD = $(CXX) -LDFLAGS += -L/usr/lib LIBS += -lsocket -lnsl -lgen -lthread PIC = -fpic AR = ar |