diff options
Diffstat (limited to 'ACE/ace')
-rw-r--r-- | ACE/ace/Default_Constants.h | 6 | ||||
-rw-r--r-- | ACE/ace/OS_NS_Thread.cpp | 6 | ||||
-rw-r--r-- | ACE/ace/OS_NS_dlfcn.inl | 2 | ||||
-rw-r--r-- | ACE/ace/OS_NS_sys_mman.inl | 2 | ||||
-rw-r--r-- | ACE/ace/OS_Thread_Adapter.h | 1 | ||||
-rw-r--r-- | ACE/ace/Process.cpp | 1 | ||||
-rw-r--r-- | ACE/ace/Sig_Handler.cpp | 3 | ||||
-rw-r--r-- | ACE/ace/Thread_Manager.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Thread_Manager.inl | 4 | ||||
-rw-r--r-- | ACE/ace/config-win32-mingw.h | 2 |
10 files changed, 12 insertions, 19 deletions
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index 14a71f01749..b954bd694c0 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -504,11 +504,9 @@ # define ACE_LD_SEARCH_PATH ACE_TEXT ("PATH") # define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (";") # define ACE_DLL_SUFFIX ACE_TEXT (".dll") -# if defined (__MINGW32__) -# define ACE_DLL_PREFIX ACE_TEXT ("lib") -# else /* __MINGW32__ */ +# if !defined (ACE_DLL_PREFIX) # define ACE_DLL_PREFIX ACE_TEXT ("") -# endif /* __MINGW32__ */ +# #endif /* !ACE_DLL_PREFIX */ #else /* !ACE_WIN32 */ # if !defined (ACE_LD_SEARCH_PATH) # define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 095dbac8e60..d64b0e52d14 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -117,17 +117,15 @@ ACE_OS_thread_key_t ACE_TSS_Emulation::native_tss_key_; # if defined (ACE_HAS_THR_C_FUNC) extern "C" void -ACE_TSS_Emulation_cleanup (void *ptr) +ACE_TSS_Emulation_cleanup (void *) { - ACE_UNUSED_ARG (ptr); // Really this must be used for ACE_TSS_Emulation code to make the TSS // cleanup } # else void -ACE_TSS_Emulation_cleanup (void *ptr) +ACE_TSS_Emulation_cleanup (void *) { - ACE_UNUSED_ARG (ptr); // Really this must be used for ACE_TSS_Emulation code to make the TSS // cleanup } diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 5b5e4142bb3..46f73235c82 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -78,7 +78,7 @@ ACE_OS::dlerror (void) { ACE_OS_TRACE ("ACE_OS::dlerror"); # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) - const char *err; + const char *err = 0; # if defined(_M_UNIX) ACE_OSCALL (::_dlerror (), const char *, 0, err); # else /* _M_UNIX */ diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index bf7a56e0cf7..4cd8385d0af 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -93,7 +93,7 @@ ACE_OS::mmap (void *addr, { SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; - const LPSECURITY_ATTRIBUTES attr = + LPSECURITY_ATTRIBUTES const attr = ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer); diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index 44576daff90..66f3c8e4c3d 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -63,7 +63,6 @@ protected: /// Ensure that this object is allocated on the heap. ~ACE_OS_Thread_Adapter (void); - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index bdf17defb44..7fff4c8c44b 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -138,7 +138,6 @@ ACE_Process::spawn (ACE_Process_Options &options) // like other OS environment. Therefore, it is user's whole responsibility to call // 'ACE_Process_Options::process_name(const ACE_TCHAR *name)' to set the proper // process name (the execution file name with path if needed). - BOOL fork_result = ACE_TEXT_CreateProcess (options.process_name(), options.command_line_buf(), diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 484a0930ee2..c932e707ec9 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -148,8 +148,7 @@ ACE_Sig_Handler::register_handler_i (int signum, if (ACE_Sig_Handler::in_range (signum)) { ACE_Sig_Action sa; // Define a "null" action. - ACE_Event_Handler *sh = ACE_Sig_Handler::handler_i (signum, - new_sh); + ACE_Event_Handler *sh = ACE_Sig_Handler::handler_i (signum, new_sh); // Return a pointer to the old <ACE_Sig_Handler> if the user // asks for this. diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index bf6e309f33f..39189cafa5c 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -1068,7 +1068,7 @@ ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum) errno = ENOENT; \ return -1; \ } \ - int result = OP (ptr, ARG); \ + int const result = OP (ptr, ARG); \ ACE_Errno_Guard error (errno); \ while (! this->thr_to_be_removed_.is_empty ()) { \ ACE_Thread_Descriptor * td = 0; \ @@ -1719,7 +1719,7 @@ ACE_Thread_Manager::apply_task (ACE_Task_Base *task, // Save/restore errno. ACE_Errno_Guard error (errno); - for (ACE_Thread_Descriptor *td; + for (ACE_Thread_Descriptor *td = 0; this->thr_to_be_removed_.dequeue_head (td) != -1; ) this->remove_thr (td, 1); diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl index 2a22b525047..7d2d75ec01c 100644 --- a/ACE/ace/Thread_Manager.inl +++ b/ACE/ace/Thread_Manager.inl @@ -268,9 +268,7 @@ ACE_Thread_Manager::at_exit (void *object, if (td == 0) return -1; else - return td->at_exit (object, - cleanup_hook, - param); + return td->at_exit (object, cleanup_hook, param); } ACE_INLINE void diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 8a89a62b372..abab20c1eac 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -102,5 +102,7 @@ #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) +#define ACE_DLL_PREFIX ACE_TEXT ("lib") + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW_H */ |