diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-04-12 21:12:58 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-04-12 21:12:58 +0000 |
| commit | b3a748b77f7933f5c750d41590ac8470842e0953 (patch) | |
| tree | 25907374ee9f944ab462f6e5266e29a1cb637c33 | |
| parent | be97c41892cbece54248c26dc8b667851f99d36a (diff) | |
| download | ATCD-b3a748b77f7933f5c750d41590ac8470842e0953.tar.gz | |
Sun Apr 12 20:37:11 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/config-linux-common.h:
The Rawhide nightly build shows that the scandir and alphasort
functions have been redefined to finally take dirrent args. The
detectable difference appears to be in the glibc version code,
which is 2.9 on the Rawhide build machine.
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/ace/config-linux-common.h | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index aeea759aa0d..aa51567b54e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,16 @@ +Sun Apr 12 20:37:11 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/config-linux-common.h: + + The Rawhide nightly build shows that the scandir and alphasort + functions have been redefined to finally take dirrent args. The + detectable difference appears to be in the glibc version code, + which is 2.9 on the Rawhide build machine. + Sat Apr 11 13:13:49 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * ace/config-macosx-leopard.h: - + Darwin also has a variation that varies the signature of unsetenv(). diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 7122d00a974..b22350192ac 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -319,7 +319,9 @@ // Platform supplies scandir() #define ACE_HAS_SCANDIR // Although the scandir man page says otherwise, this setting is correct. -#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR +#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 9) +# define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR +#endif // A conflict appears when including both <ucontext.h> and // <sys/procfs.h> with recent glibc headers. |