diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-11 13:18:26 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-11 13:18:26 +0000 |
| commit | 610ac22d731ef684cd7f96b1540d904941becbe2 (patch) | |
| tree | d0dabb1a5e69b2c9ee6985f3308765f46f2b3bca /ace/config-linux-common.h | |
| parent | 10c1140eedef1536eb2e4840ab50da1ef931c1d0 (diff) | |
| download | ATCD-610ac22d731ef684cd7f96b1540d904941becbe2.tar.gz | |
re-enabled msg_* undefs and defines, but for libc5 (non-glibc) only
Diffstat (limited to 'ace/config-linux-common.h')
| -rw-r--r-- | ace/config-linux-common.h | 32 |
1 files changed, 12 insertions, 20 deletions
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 <robi@codalan.cz> 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 <robi@codalan.cz> - // 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 <levine@cs.wustl.edu> - // 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 |