diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-16 10:07:10 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-16 10:07:10 +0200 |
| commit | 4c26e2b362eb77103f7cb851afee82f64c1dafa2 (patch) | |
| tree | db4263b20ba929022dfca37e85dbcc9196726f86 | |
| parent | 185dd520d88bb29eaae7a62d69b70c46331abba9 (diff) | |
| download | ATCD-4c26e2b362eb77103f7cb851afee82f64c1dafa2.tar.gz | |
Simplified config-win32-common.h, moved the defines specific for a compiler to the respective file
* ACE/ace/config-win32-borland.h:
* ACE/ace/config-win32-common.h:
* ACE/ace/config-win32-mingw.h:
* ACE/ace/config-win32-mingw64.h:
* ACE/ace/config-win32-msvc-14.h:
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 11 | ||||
| -rw-r--r-- | ACE/ace/config-win32-mingw.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-win32-mingw64.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-14.h | 7 |
5 files changed, 14 insertions, 11 deletions
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index e23007815ce..cf2ef4448a7 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -169,6 +169,7 @@ #define ACE_HAS_BUILTIN_BSWAP32 #define ACE_HAS_BUILTIN_BSWAP64 #define ACE_LACKS_INLINE_ASSEMBLY +#define ACE_LACKS_PID_T #if __cplusplus >= 201103L # define ACE_HAS_CPP11 diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 7a4ac9282b9..a22eb51989a 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -304,17 +304,6 @@ #define ACE_LACKS_IOVEC #define ACE_LACKS_LOG2 #define ACE_LACKS_CADDR_T -#if !defined(__MINGW32__) && !defined (__BORLANDC__) -# define ACE_LACKS_MODE_T -#endif -#if !defined(__MINGW32__) -# define ACE_LACKS_PID_T -#endif -#if !defined (__BORLANDC__) -# define ACE_LACKS_NLINK_T -# define ACE_LACKS_UID_T -# define ACE_LACKS_GID_T -#endif #define ACE_LACKS_SETENV #define ACE_LACKS_UNSETENV diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 61f4b833632..767feb993fc 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -85,6 +85,9 @@ #define ACE_HAS_WINSOCK2_GQOS #define ACE_ISCTYPE_EQUIVALENT ::_isctype #define ACE_LACKS_SET_ABORT_BEHAVIOR +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T // We trust the user: He must have used -mpentiumpro or -mpentium // if that is what he wants. diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index 1f3231b0e56..f7414ebda54 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -115,6 +115,9 @@ #define ACE_HAS_NONCONST_WCSDUP #define ACE_ISCTYPE_EQUIVALENT ::_isctype #define ACE_LACKS_SET_ABORT_BEHAVIOR +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T #define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 44e670fc9d4..866c45f6dd2 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -141,5 +141,12 @@ #define ACE_LACKS_CLOSEDIR #define ACE_LACKS_READDIR +#define ACE_LACKS_MODE_T +#define ACE_LACKS_PID_T + +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_14_H */ |