diff options
Diffstat (limited to 'ACE/ace')
27 files changed, 265 insertions, 37 deletions
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 054a29a255b..9c9bf1197b1 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -1697,6 +1697,7 @@ protected: /// Refers to proxy for this handler. ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> proxy_; +private: ACE_UNIMPLEMENTED_FUNC (ACE_Handler (const ACE_Handler &)) ACE_UNIMPLEMENTED_FUNC (ACE_Handler operator= (const ACE_Handler &)) }; diff --git a/ACE/ace/Connection_Recycling_Strategy.cpp b/ACE/ace/Connection_Recycling_Strategy.cpp index 0705c8a04be..d8be7436b73 100644 --- a/ACE/ace/Connection_Recycling_Strategy.cpp +++ b/ACE/ace/Connection_Recycling_Strategy.cpp @@ -4,6 +4,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void) +{ +} + ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void) { } diff --git a/ACE/ace/Connection_Recycling_Strategy.h b/ACE/ace/Connection_Recycling_Strategy.h index fa9599f678c..28ba1de281d 100644 --- a/ACE/ace/Connection_Recycling_Strategy.h +++ b/ACE/ace/Connection_Recycling_Strategy.h @@ -29,6 +29,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Connection_Recycling_Strategy { public: + ACE_Connection_Recycling_Strategy (void); + /// Virtual Destructor virtual ~ACE_Connection_Recycling_Strategy (void); diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp index 73744ecc287..1056d2956fa 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp @@ -13,6 +13,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ETCL_Constraint_Visitor::ETCL_Constraint_Visitor (void) +{ +} + ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void) { } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h index b18a713f08e..6e000af591a 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h @@ -43,6 +43,7 @@ class ETCL_Preference; class ACE_ETCL_Export ETCL_Constraint_Visitor { public: + ETCL_Constraint_Visitor (void); virtual ~ETCL_Constraint_Visitor (void); virtual int visit_literal (ETCL_Literal_Constraint *); diff --git a/ACE/ace/FIFO_Recv_Msg.inl b/ACE/ace/FIFO_Recv_Msg.inl index 4a7ce576e38..f1fc7e3f8f7 100644 --- a/ACE/ace/FIFO_Recv_Msg.inl +++ b/ACE/ace/FIFO_Recv_Msg.inl @@ -32,7 +32,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) #else /* Do the ol' 2-read trick... */ if (ACE_OS::read (this->get_handle (), (char *) &recv_msg.len, - sizeof recv_msg.len) != sizeof recv_msg.len) + sizeof recv_msg.len) != (ssize_t) sizeof recv_msg.len) { return -1; } diff --git a/ACE/ace/Log_Msg_Callback.cpp b/ACE/ace/Log_Msg_Callback.cpp index 726879c0b7b..17b72c06bb6 100644 --- a/ACE/ace/Log_Msg_Callback.cpp +++ b/ACE/ace/Log_Msg_Callback.cpp @@ -2,12 +2,14 @@ #include "ace/Log_Msg_Callback.h" - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Log_Msg_Callback::ACE_Log_Msg_Callback (void) +{ +} + ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void) { } + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h index 2a372ed76b8..abb3f814e9c 100644 --- a/ACE/ace/Log_Msg_Callback.h +++ b/ACE/ace/Log_Msg_Callback.h @@ -54,6 +54,9 @@ class ACE_Log_Record; class ACE_Export ACE_Log_Msg_Callback { public: + /// Default constructor + ACE_Log_Msg_Callback (void); + /// No-op virtual destructor. virtual ~ACE_Log_Msg_Callback (void); diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp index 98bbd87374c..7a10425984d 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp @@ -14,6 +14,10 @@ namespace ACE { namespace Monitor_Control { + Auto_Update_Starter::Auto_Update_Starter (void) + { + } + int Auto_Update_Starter::svc (void) { diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.h b/ACE/ace/Monitor_Control/Auto_Update_Starter.h index 8339a18f02a..7fc829ef576 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.h +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.h @@ -45,6 +45,8 @@ namespace ACE class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base { public: + Auto_Update_Starter (void); + int svc (void); }; } diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp index 30c0768c9b9..d7235f67f88 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp @@ -16,6 +16,10 @@ namespace ACE { namespace Monitor_Control { + Monitor_Point_Auto_Query::Monitor_Point_Auto_Query () + { + } + int Monitor_Point_Auto_Query::handle_timeout ( const ACE_Time_Value& /* current */, diff --git a/ACE/ace/Monitor_Control/Monitor_Query.h b/ACE/ace/Monitor_Control/Monitor_Query.h index cc6589036dd..3051c008eed 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.h +++ b/ACE/ace/Monitor_Control/Monitor_Query.h @@ -41,6 +41,9 @@ namespace ACE : public ACE_Event_Handler { public: + /// Default constructor + Monitor_Point_Auto_Query (); + /// Override of ACE base class method. virtual int handle_timeout (const ACE_Time_Value& current, const void* monitor_query); diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 6a3d6232358..9fec2eae63a 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -1471,7 +1471,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, return -1; # if defined (ACE_WIN32) - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { @@ -1654,7 +1654,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { @@ -1746,7 +1746,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { diff --git a/ACE/ace/OS_NS_signal.cpp b/ACE/ace/OS_NS_signal.cpp index 8b708e44859..595442068c0 100644 --- a/ACE/ace/OS_NS_signal.cpp +++ b/ACE/ace/OS_NS_signal.cpp @@ -8,17 +8,7 @@ #if !defined (ACE_HAS_SIGINFO_T) siginfo_t::siginfo_t (ACE_HANDLE handle) - : si_handle_ (handle), - si_handles_ (&handle) -{ -} - -siginfo_t::siginfo_t (ACE_HANDLE *handles) - : si_handle_ (handles[0]), - si_handles_ (handles) + : si_handle_ (handle) { } #endif /* ACE_HAS_SIGINFO_T */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index e7eeb96fc83..896d6142f30 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -129,13 +129,9 @@ inline int ace_sigsuspend_helper (const sigset_t *s) struct ACE_Export siginfo_t { siginfo_t (ACE_HANDLE handle); - siginfo_t (ACE_HANDLE *handles); // JCEJ 12/23/96 /// Win32 HANDLE that has become signaled. ACE_HANDLE si_handle_; - - /// Array of Win32 HANDLEs all of which have become signaled. - ACE_HANDLE *si_handles_; }; # endif /* ACE_HAS_SIGINFO_T */ diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 80bec1ada89..a21e2e62b44 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -37,8 +37,11 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) ACE_BEGIN_VERSIONED_NAMESPACE_DECL +namespace ACE_OS +{ + void -ACE_OS::ace_flock_t::dump (void) const +ace_flock_t::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump"); @@ -67,6 +70,8 @@ ACE_OS::ace_flock_t::dump (void) const #endif /* ACE_HAS_DUMP */ } +} /* namespace ACE_OS */ + /*****************************************************************************/ diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index 72f21215fe1..68d74c16b32 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -892,7 +892,7 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, if (n > 0) { // Check to see if we've got a short read. - if (n != sizeof buffer) + if ((size_t)n != sizeof buffer) { ssize_t const remainder = sizeof buffer - n; diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 87b052162fa..bf160f1e6be 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -329,6 +329,10 @@ ACE_Sig_Handlers_Set::instance (int signum) ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers) +ACE_Sig_Handlers::ACE_Sig_Handlers (void) +{ +} + void ACE_Sig_Handlers::dump (void) const { diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index 3e8732e5579..711936e2934 100644 --- a/ACE/ace/Sig_Handler.h +++ b/ACE/ace/Sig_Handler.h @@ -165,6 +165,9 @@ private: class ACE_Export ACE_Sig_Handlers : public ACE_Sig_Handler { public: + /// Default constructor + ACE_Sig_Handlers (void); + // = Registration and removal methods. /** * Add a new ACE_Event_Handler and a new sigaction associated with diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp index 7aa82ab74a7..5a986f88463 100644 --- a/ACE/ace/TTY_IO.cpp +++ b/ACE/ace/TTY_IO.cpp @@ -26,6 +26,10 @@ namespace ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_TTY_IO::ACE_TTY_IO (void) +{ +} + ACE_TTY_IO::Serial_Params::Serial_Params (void) { baudrate = 9600; diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index d3f165eca23..f0ed759a757 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -36,6 +36,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_TTY_IO : public ACE_DEV_IO { public: + ACE_TTY_IO (void); + enum Control_Mode { SETPARAMS, ///< Set control parameters. diff --git a/ACE/ace/Thread_Hook.cpp b/ACE/ace/Thread_Hook.cpp index 16c156435f1..68ede402b9b 100644 --- a/ACE/ace/Thread_Hook.cpp +++ b/ACE/ace/Thread_Hook.cpp @@ -5,6 +5,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Thread_Hook::ACE_Thread_Hook() +{ +} + ACE_Thread_Hook::~ACE_Thread_Hook () { } diff --git a/ACE/ace/Thread_Hook.h b/ACE/ace/Thread_Hook.h index 54b4419250d..5cf7aa02705 100644 --- a/ACE/ace/Thread_Hook.h +++ b/ACE/ace/Thread_Hook.h @@ -34,6 +34,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Thread_Hook { public: + /// Default constructor + ACE_Thread_Hook (void); + /// Destructor. virtual ~ACE_Thread_Hook (void); diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 22b544286ca..432457a980d 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -223,7 +223,7 @@ // ============================================================================ #if !defined (ACE_UNUSED_ARG) -# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) +# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || (defined (__BORLANDC__) && defined (__clang__)) # define ACE_UNUSED_ARG(a) (void) (a) # elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) // Some compilers complain about "statement with no effect" with (a). diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h new file mode 100644 index 00000000000..4bed71c4fab --- /dev/null +++ b/ACE/ace/config-win32-borland.h @@ -0,0 +1,179 @@ +//-*- C++ -*- +//$Id$ + +// The following configuration file contains defines for Borland compilers. + +#ifndef ACE_CONFIG_WIN32_BORLAND_H +#define ACE_CONFIG_WIN32_BORLAND_H +#include /**/ "ace/pre.h" + +#ifndef ACE_CONFIG_WIN32_H +#error Use config-win32.h in config.h instead of this header +#endif /* ACE_CONFIG_WIN32_H */ + +#define ACE_HAS_CUSTOM_EXPORT_MACROS 1 +#define ACE_Proper_Export_Flag __declspec (dllexport) +#define ACE_Proper_Import_Flag __declspec (dllimport) +#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T +#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>; +#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T +#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>; + +// In later versions of C++Builder we will prefer inline functions by +// default. The debug configuration of ACE is built with functions +// out-of-line, so when linking your application against a debug ACE +// build, you can choose to use the out-of-line functions by adding +// ACE_NO_INLINE=1 to your project settings. +# if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ 1 +# endif /* __ACE_INLINE__ */ + +# define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") +# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) +# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) +# define ACE_CC_BETA_VERSION (0) + +#if (__BORLANDC__ >= 0x620) +# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" +#endif + +// Automatically define WIN32 macro if the compiler tells us it is our +// target platform. +# if defined (__WIN32__) && !defined (WIN32) +# define WIN32 1 +# endif + +// When building a VCL application, the main VCL header file should be +// included before anything else. You can define ACE_HAS_VCL=1 in your +// project settings to have this file included for you automatically. +# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0) +# include /**/ <vcl.h> +# endif + +#if defined (__clang__) +# define ACE_HAS_BCC64 +#else +# define ACE_HAS_BCC32 +#endif + +#if defined (ACE_HAS_BCC64) +// Use 32bit pre processor because cpp64 doesn't have the same +// options +# define ACE_CC_PREPROCESSOR "CPP32.EXE" +#else +# define ACE_CC_PREPROCESSOR "CPP32.EXE" +#endif + +# include "ace/config-win32-common.h" + +# define ACE_WSTRING_HAS_USHORT_SUPPORT 1 +# define ACE_HAS_DIRENT + +#define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 + +#define ACE_LACKS_TERMIOS_H +#define ACE_LACKS_NETINET_TCP_H +#define ACE_LACKS_REGEX_H +#define ACE_LACKS_SYS_MSG_H +#define ACE_LACKS_PWD_H +#define ACE_LACKS_POLL_H +#define ACE_LACKS_SYS_SHM_H +#define ACE_LACKS_STRINGS_H +#define ACE_LACKS_SEMAPHORE_H +#define ACE_LACKS_INTTYPES_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SYS_SELECT_H +#define ACE_LACKS_SYS_TIME_H +#define ACE_LACKS_SYS_RESOURCE_H +#define ACE_LACKS_SYS_WAIT_H +#define ACE_LACKS_DLFCN_H +#define ACE_LACKS_SYS_MMAN_H +#define ACE_LACKS_SYS_UIO_H +#define ACE_LACKS_SYS_SOCKET_H +#define ACE_LACKS_NETINET_IN_H +#define ACE_LACKS_NETDB_H +#define ACE_LACKS_NET_IF_H +#define ACE_LACKS_SYS_IPC_H +#define ACE_LACKS_SYS_SEM_H +#define ACE_LACKS_SYS_IOCTL_H +#define ACE_LACKS_STROPTS_H + +#undef ACE_LACKS_STRUCT_DIR +#undef ACE_LACKS_CLOSEDIR +#undef ACE_LACKS_OPENDIR +#undef ACE_LACKS_READDIR +#undef ACE_LACKS_REWINDDIR + +#define ACE_HAS_WOPENDIR +#define ACE_HAS_WCLOSEDIR +#define ACE_HAS_WREADDIR +#define ACE_HAS_WREWINDDIR + +#define ACE_LACKS_STRRECVFD +#define ACE_USES_EXPLICIT_STD_NAMESPACE + +#if defined (ACE_HAS_BCC64) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_EXPORT_NESTED_CLASSES 1 +#define ACE_HAS_CPLUSPLUS_HEADERS 1 +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#define ACE_HAS_STDCPP_STL_INCLUDES 1 +#define ACE_HAS_STRING_CLASS 1 +#define ACE_HAS_USER_MODE_MASKS 1 +#define ACE_LACKS_ACE_IOSTREAM 1 +#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 +#define ACE_HAS_NEW_NOTHROW +#define ACE_TEMPLATES_REQUIRE_SOURCE 1 +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#define ACE_USES_STD_NAMESPACE_FOR_ABS 1 +#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) + +#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +// must have _MT defined to include multithreading +// features from win32 headers +# if !defined(__MT__) +// *** DO NOT *** defeat this error message by defining __MT__ yourself. +// You must link with the multi threaded libraries. Add -tWM to your +// compiler options +# error You must link against multi-threaded libraries when using ACE (check your project settings) +# endif /* !__MT__ */ +#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ + +#if (__BORLANDC__ <= 0x660) +# define ACE_LACKS_ISWCTYPE +# define ACE_LACKS_ISCTYPE +#endif + +#if (__BORLANDC__ >= 0x650) && (__BORLANDC__ <= 0x660) +# define ACE_LACKS_STRTOK_R +#endif + +#if (__BORLANDC__ <= 0x660) +# define ACE_LACKS_LOCALTIME_R +#endif + +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#define ACE_STRCASECMP_EQUIVALENT ::stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::strnicmp +#define ACE_WTOF_EQUIVALENT ::_wtof +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) +#define ACE_HAS_ITOA 1 + +#if defined (ACE_HAS_BCC64) +# define ACE_LACKS_SWAB +#endif + +#if defined (ACE_HAS_BCC32) +# define ACE_SIZEOF_LONG_DOUBLE 10 +# define ACE_NEEDS_DL_UNDERSCORE +#endif + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_BORLAND_H */ + diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 5846e3e9730..7305cece2e9 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -134,7 +134,7 @@ // #endif // Define the special export macros needed to export symbols outside a dll -#if !defined(__BORLANDC__) && (!defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0)) +#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0) #if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) #undef ACE_HAS_CUSTOM_EXPORT_MACROS #endif diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h index 1ada8467838..24833d682f0 100644 --- a/ACE/ace/config-win32.h +++ b/ACE/ace/config-win32.h @@ -22,23 +22,31 @@ // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers -#include "ace/config-win32-common.h" +// We need to ensure that for Borland vcl.h can be included before +// windows.h. So we will not include config-win32-common.h from here, +// but instead let it be included at the appropriate place in +// config-win32-borland.h. +#if !defined (__BORLANDC__) +# include "ace/config-win32-common.h" +#endif /* !__BORLANDC__ */ // Include the config-win32-* file specific to the compiler -#if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" +#if defined (__BORLANDC__) +# include "ace/config-win32-borland.h" +#elif defined (_MSC_VER) +# include "ace/config-win32-msvc.h" #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 -# include "ace/config-win32-cegcc.h" +# include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) -# if defined (__MINGW64_VERSION_MAJOR) -# include "ace/config-win32-mingw64.h" -# else -# include "ace/config-win32-mingw.h" -# endif +# if defined (__MINGW64_VERSION_MAJOR) +# include "ace/config-win32-mingw64.h" +# else +# include "ace/config-win32-mingw.h" +# endif #elif defined (__DMC__) -# include "ace/config-win32-dmc.h" +# include "ace/config-win32-dmc.h" #else -# error Compiler is not supported +# error Compiler is not supported #endif #include /**/ "ace/post.h" |