summaryrefslogtreecommitdiff
path: root/ACE/ace/config-linux-common.h
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2009-04-12 21:12:58 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2009-04-12 21:12:58 +0000
commit4df082b156ab3f915051af3096ac4d36c32b42e2 (patch)
tree25907374ee9f944ab462f6e5266e29a1cb637c33 /ACE/ace/config-linux-common.h
parent8bbed9aa243b7af58562900c96a2f119d6dee2dd (diff)
downloadATCD-4df082b156ab3f915051af3096ac4d36c32b42e2.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.
Diffstat (limited to 'ACE/ace/config-linux-common.h')
-rw-r--r--ACE/ace/config-linux-common.h4
1 files changed, 3 insertions, 1 deletions
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.