diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/Lib_Find.cpp | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/Lib_Find.cpp')
| -rw-r--r-- | dep/acelite/ace/Lib_Find.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/dep/acelite/ace/Lib_Find.cpp b/dep/acelite/ace/Lib_Find.cpp index c5a0610f065..6c63df21b55 100644 --- a/dep/acelite/ace/Lib_Find.cpp +++ b/dep/acelite/ace/Lib_Find.cpp @@ -1,4 +1,4 @@ -// $Id: Lib_Find.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Lib_Find.cpp 95630 2012-03-22 13:04:47Z johnnyw $ #include "ace/Lib_Find.h" #include "ace/Log_Msg.h" @@ -608,7 +608,13 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) const char *tmpdir = ACE_OS::getenv ("TMPDIR"); if (tmpdir == 0) - tmpdir = "/tmp"; + { +#if defined (ACE_DEFAULT_TEMP_DIR) + tmpdir = ACE_DEFAULT_TEMP_DIR; +#else + tmpdir = "/tmp"; +#endif + } size_t len = ACE_OS::strlen (tmpdir); @@ -653,7 +659,10 @@ ACE::open_temp_file (const ACE_TCHAR *name, int mode, int perm) // Unlink it so that the file will be removed automatically when the // process goes away. if (ACE_OS::unlink (name) == -1) - return ACE_INVALID_HANDLE; + { + ACE_OS::close (handle); + return ACE_INVALID_HANDLE; + } else // Return the handle. return handle; |