From 610ac22d731ef684cd7f96b1540d904941becbe2 Mon Sep 17 00:00:00 2001 From: levine Date: Sun, 11 Oct 1998 13:18:26 +0000 Subject: re-enabled msg_* undefs and defines, but for libc5 (non-glibc) only --- ace/config-linux-common.h | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'ace/config-linux-common.h') diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 6570f1e7e37..78f164e4cdf 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -55,14 +55,24 @@ // NOTE: end of glibc 2.0 (0.961212-5)-specific configuration. # if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 + // These were suggested by Robert Hanzlik to get + // ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8. # undef ACE_HAS_BYTESEX_H # define ACE_HAS_SIGINFO_T # define ACE_LACKS_SIGINFO_H # define ACE_HAS_UCONTEXT_T # endif /* __GLIBC__ 2.1+ */ - // Changes above were suggested by Robert Hanzlik - // to get ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8 +#else /* ! __GLIB__ */ + // Fixes a problem with some non-glibc versions of Linux... + #ifndef msg_accrights + # undef msg_control + # define msg_accrights msg_control + #endif + #ifndef msg_accrightslen + # undef msg_controllen + # define msg_accrightslen msg_controllen + #endif #endif /* __GLIBC__ */ @@ -84,24 +94,6 @@ # define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#if 0 - // Wed Sep 23 22:29:37 1998 David L. Levine - // Disabled this, because it doesn't really look right. I think - // that it was added to work around some problems with very early - // versions of glib2. It no longer seems to be necessary. - - // Fixes a problem with new versions of Linux... - #ifndef msg_accrights - # undef msg_control - # define msg_accrights msg_control - #endif - - #ifndef msg_accrightslen - # undef msg_controllen - # define msg_accrightslen msg_controllen - #endif -#endif /* 0 */ - // Compiler/platform supports alloca(). #define ACE_HAS_ALLOCA -- cgit v1.2.1