diff options
| author | McCabe Maxsted | 2011-02-18 19:44:16 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-02-18 19:44:16 -0700 |
| commit | f6c52845fa2509f420e599b4c2033dfa1571f1ed (patch) | |
| tree | 281bf361a3fdd22665c571b3eee417d340c77c9f /linden/indra/llvfs | |
| parent | Created a media_plugin_gstreamer010.log file in the cwd for the GStreamer plugin (diff) | |
| parent | Fixed Windows compile error introduced in fe9a3d2b. Also made sure winsock2.h... (diff) | |
| download | meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.zip meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.gz meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.bz2 meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.xz | |
Merge remote branch 'remotes/github/weekly' into weekly
Diffstat (limited to 'linden/indra/llvfs')
| -rwxr-xr-x | linden/indra/llvfs/llpidlock.h | 2 | ||||
| -rw-r--r-- | linden/indra/llvfs/llvfs.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h index efcfd91..6103599 100755 --- a/linden/indra/llvfs/llpidlock.h +++ b/linden/indra/llvfs/llpidlock.h | |||
| @@ -39,6 +39,8 @@ class LLFrameTimer; | |||
| 39 | 39 | ||
| 40 | #if LL_WINDOWS //For windows platform. | 40 | #if LL_WINDOWS //For windows platform. |
| 41 | 41 | ||
| 42 | # define WIN32_LEAN_AND_MEAN | ||
| 43 | # include <winsock2.h> | ||
| 42 | #include <windows.h> | 44 | #include <windows.h> |
| 43 | 45 | ||
| 44 | #else //Everyone Else | 46 | #else //Everyone Else |
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp index dea8c9c..654dfa1 100644 --- a/linden/indra/llvfs/llvfs.cpp +++ b/linden/indra/llvfs/llvfs.cpp | |||
| @@ -237,7 +237,7 @@ const S32 LLVFSFileBlock::SERIAL_SIZE = 34; | |||
| 237 | LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash) | 237 | LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash) |
| 238 | : mRemoveAfterCrash(remove_after_crash) | 238 | : mRemoveAfterCrash(remove_after_crash) |
| 239 | { | 239 | { |
| 240 | mDataMutex = new LLMutex(0); | 240 | mDataMutex = new LLMutex; |
| 241 | 241 | ||
| 242 | S32 i; | 242 | S32 i; |
| 243 | for (i = 0; i < VFSLOCK_COUNT; i++) | 243 | for (i = 0; i < VFSLOCK_COUNT; i++) |