diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-10-27 12:30:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-10-27 12:30:12 +0000 |
| commit | 047e73250d92b8823f40fb11cf2f069d9227f68a (patch) | |
| tree | 7ae701fff834241a47be6213f179c62979328e40 | |
| parent | 1905614fd898682bace1c9e6c83e81dbdd4dbc4d (diff) | |
| download | ATCD-047e73250d92b8823f40fb11cf2f069d9227f68a.tar.gz | |
Mon Oct 27 12:32:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-common.h:
* ace/os_include/sys/os_types.h:
Introduce new ACE_LACKS_PID_T which is set on Windows, but
not with MinGW
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 3 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_types.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 223dcc490bc..b45466da36e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Oct 27 12:32:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-common.h: + * ace/os_include/sys/os_types.h: + Introduce new ACE_LACKS_PID_T which is set on Windows, but + not with MinGW + Mon Oct 27 07:57:57 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_sys_socket.inl: diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 412d1334da6..e5e1757d975 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -310,6 +310,9 @@ #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 diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index dcf8af5077a..4d4d8369e9c 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -137,7 +137,7 @@ typedef DWORD nlink_t; typedef unsigned long useconds_t; #endif -#if defined (ACE_WIN32) && !defined(__MINGW32__) +#if defined (ACE_LACKS_PID_T) typedef int pid_t; #endif /* ACE_WIN32 */ |