diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-19 22:15:16 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-19 22:15:16 +0000 |
| commit | 74ff4ea2e708b56b635fb97d3622a39c4af4bd6a (patch) | |
| tree | 3de290016340d1a74d6fb5740e231d596f8ac983 /ace/config-win32-common.h | |
| parent | 8514e7ef6c838dbc1215ccb89e351c8d8e31cf53 (diff) | |
| download | ATCD-74ff4ea2e708b56b635fb97d3622a39c4af4bd6a.tar.gz | |
added ACE_LACKS_PRAGMA_ONCE, unless _MSC_VER < 1000
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index f7a54c77b46..52010b230d4 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -41,6 +41,10 @@ typedef unsigned __int64 ACE_UINT64; #undef ACE_HAS_ANSI_CASTS #endif /* ACE_HAS_ANSI_CASTS && ACE_HAS_ANSI_CASTS == 0 */ +#if _MSC_VER < 1000 +# define ACE_LACKS_PRAGMA_ONCE +#endif /* _MSC_VER < 1000 */ + // Only MSVC 5.0 definitions #if (_MSC_VER >= 1100) #if !defined (ACE_HAS_WINCE) @@ -344,14 +348,14 @@ typedef unsigned __int64 ACE_UINT64; #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) #if !defined (_WINSOCK2API_) - // will also include windows.h, if not present - #include /**/ <winsock2.h> + // will also include windows.h, if not present + #include /**/ <winsock2.h> #endif /* _WINSOCK2API */ - #if !defined _MSWSOCK_ + #if !defined _MSWSOCK_ #include /**/ <mswsock.h> #endif /* _MSWSOCK_ */ - + #if defined (_MSC_VER) #pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "mswsock.lib") @@ -360,8 +364,8 @@ typedef unsigned __int64 ACE_UINT64; #define ACE_WSOCK_VERSION 2, 0 #else #if !defined (_WINSOCKAPI_) - // will also include windows.h, if not present - #include /**/ <winsock.h> + // will also include windows.h, if not present + #include /**/ <winsock.h> #endif /* _WINSOCKAPI */ #if defined (_MSC_VER) && !defined (UNDER_CE) |