diff options
| author | Fred Hornsey <fred@hornsey.us> | 2019-06-05 23:28:56 -0500 |
|---|---|---|
| committer | Fred Hornsey <fred@hornsey.us> | 2019-06-05 23:28:56 -0500 |
| commit | 8fda2e288376fe735a316e396763daa40afb1167 (patch) | |
| tree | f3b42013941bc3520863f378172f1a8a7669da25 | |
| parent | 9b2936e208d7392baf4a0301bafe1a2b74b55274 (diff) | |
| download | ATCD-8fda2e288376fe735a316e396763daa40afb1167.tar.gz | |
Move A Check Back to config-linux.h
| -rw-r--r-- | ACE/ace/config-linux-common.h | 5 | ||||
| -rw-r--r-- | ACE/ace/config-linux.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 838d5ff8543..b9d112602ad 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -155,11 +155,6 @@ // 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 // Compiler/platform contains the <sys/syscall.h> file. #define ACE_HAS_SYS_SYSCALL_H diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h index 5808ee15ef5..954d61f091d 100644 --- a/ACE/ace/config-linux.h +++ b/ACE/ace/config-linux.h @@ -106,6 +106,12 @@ #define ACE_HAS_UALARM +#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. //#define ACE_HAS_PROC_FS |