summaryrefslogtreecommitdiff
path: root/ACE/ace/config-linux-common.h
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/config-linux-common.h')
-rw-r--r--ACE/ace/config-linux-common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 7122d00a974..a38a8c54503 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -318,8 +318,11 @@
// Platform supplies scandir()
#define ACE_HAS_SCANDIR
+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10)
// Although the scandir man page says otherwise, this setting is correct.
+// The setting was fixed in 2.10, so do not use the hack after that.
#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR
+#endif
// A conflict appears when including both <ucontext.h> and
// <sys/procfs.h> with recent glibc headers.