diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-22 04:48:31 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-22 04:48:31 +0000 |
commit | 43d649ec5bc53f8b3efb6ecdb27fcf9efa647f46 (patch) | |
tree | d1b23069a5c756ce1da0818044d05a688950abf0 /ace | |
parent | b30006408711e38e17215b79a0e8d9b9220fba3b (diff) | |
download | ATCD-43d649ec5bc53f8b3efb6ecdb27fcf9efa647f46.tar.gz |
ChangeLogTag:Sun Jun 22 04:32:15 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'ace')
-rw-r--r-- | ace/Asynch_IO.h | 1 | ||||
-rw-r--r-- | ace/Basic_Types.h | 8 | ||||
-rw-r--r-- | ace/Global_Macros.h | 2 | ||||
-rw-r--r-- | ace/Malloc_Allocator.i | 2 | ||||
-rw-r--r-- | ace/Malloc_Base.h | 1 | ||||
-rw-r--r-- | ace/OS.h | 4 | ||||
-rw-r--r-- | ace/config-win32-common.h | 1 | ||||
-rw-r--r-- | ace/os_include/sys/os_mman.h | 4 | ||||
-rw-r--r-- | ace/os_include/sys/os_types.h | 8 |
9 files changed, 18 insertions, 13 deletions
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h index 73d1a1fc6c4..2ee0f1b5385 100644 --- a/ace/Asynch_IO.h +++ b/ace/Asynch_IO.h @@ -37,6 +37,7 @@ #include "ace/os_include/os_signal.h" #include "ace/os_include/sys/os_socket.h" +#include "ace/os_include/sys/os_types.h" # if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ && ! defined (ACE_HAS_PHARLAP) diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index c6a5d86de93..dec556db8ae 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -633,14 +633,6 @@ typedef ptrdiff_t ptr_arith_t; #define ACE_FLT_MAX 3.402823466e+38F #define ACE_DBL_MAX 1.7976931348623158e+308 -#if !defined (ACE_HAS_SSIZE_T) -# if defined (ACE_WIN64) - typedef SSIZE_T ssize_t; -# else - typedef int ssize_t; -# endif /* ACE_WIN64 */ -#endif /* ACE_HAS_SSIZE_T */ - # if defined (__ACE_INLINE__) # include "ace/Basic_Types.i" # endif /* __ACE_INLINE__ */ diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index bea349074a3..dffd8af550e 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -642,6 +642,7 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \ # define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X) //@} +#if !defined (ACE_WIN32) // Add some typedefs and macros to enhance Win32 conformance... # if !defined (LPSECURITY_ATTRIBUTES) # define LPSECURITY_ATTRIBUTES int @@ -688,6 +689,7 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \ # if !defined(PIPE_TYPE_MESSAGE) # define PIPE_TYPE_MESSAGE 0 # endif /* !defined PIPE_TYPE_MESSAGE */ +#endif /* !ACE_WIN32 */ // Some useful abstrations for expressions involving // ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.i index bd486e3f819..04b7c4aa8a1 100644 --- a/ace/Malloc_Allocator.i +++ b/ace/Malloc_Allocator.i @@ -3,7 +3,7 @@ #include "ace/os_include/os_errno.h" #if !defined (ACE_NDEBUG) -# include "ace/Log_Message.h" // for ACE_ASSERT +# include "ace/Log_Msg.h" // for ACE_ASSERT #else # if !defined (ACE_ASSERT) # define ACE_ASSERT(X) diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h index c074ab77d75..f1cefa8d3b2 100644 --- a/ace/Malloc_Base.h +++ b/ace/Malloc_Base.h @@ -23,6 +23,7 @@ #include "ace/os_include/sys/os_types.h" #include "ace/os_include/sys/os_mman.h" +#include "ace/os_include/sys/os_types.h" // The definition of this class is located in Malloc.cpp. @@ -1806,10 +1806,6 @@ typedef struct utsname ACE_utsname; # define ENXIO 6 #endif /* ENXIO */ -# if !defined (MS_SYNC) -# define MS_SYNC 0x0 -# endif /* !MS_SYNC */ - # if !defined (PIPE_BUF) # define PIPE_BUF 5120 # endif /* PIPE_BUF */ diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 5abf05f18af..213c0273970 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -214,6 +214,7 @@ #define ACE_LACKS_READDIR_R #define ACE_LACKS_INET_ATON #define ACE_LACKS_PARAM_H +#define ACE_LACKS_PTHREAD_H #define ACE_HAS_SNPRINTF #define ACE_HAS_VFWPRINTF diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h index bf02904c39c..c66c22f9bfb 100644 --- a/ace/os_include/sys/os_mman.h +++ b/ace/os_include/sys/os_mman.h @@ -80,6 +80,10 @@ PAGE_NOCACHE */ # define PROT_RDWR (PROT_READ|PROT_WRITE) #endif /* PROT_RDWR */ +# if !defined (MS_SYNC) +# define MS_SYNC 0x0 +# endif /* !MS_SYNC */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ace/os_include/sys/os_types.h b/ace/os_include/sys/os_types.h index a57b5e7b90c..0880c4abd8c 100644 --- a/ace/os_include/sys/os_types.h +++ b/ace/os_include/sys/os_types.h @@ -112,6 +112,14 @@ extern "C" typedef long pid_t; #endif /* ACE_WIN32 && !__MINGW32__ */ +#if !defined (ACE_HAS_SSIZE_T) +# if defined (ACE_WIN64) + typedef SSIZE_T ssize_t; +# else + typedef int ssize_t; +# endif /* ACE_WIN64 */ +#endif /* ACE_HAS_SSIZE_T */ + #ifdef __cplusplus } #endif /* __cplusplus */ |