Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved most errors under vc100 compiler

Browse Source
This commit is contained in:
Shyotl
2011-05-14 22:30:30 -05:00
parent fb14aff1f6
commit 3926d2d30a
15 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llplugin/llplugininstance.h
View File

@@ -36,9 +36,8 @@
#define LL_LLPLUGININSTANCE_H
#include "llstring.h"
#include "llapr.h"
#include "apr_dso.h"
struct apr_dso_handle_t; //Cannot include llapr, as it defines NOUSER for windows, which breaks including commdlg.h!
/**
* @brief LLPluginInstanceMessageListener receives messages sent from the plugin loader shell to the plugin.

4
indra/llplugin/llpluginmessagepipe.cpp
View File

@@ -226,11 +226,11 @@ bool LLPluginMessagePipe::pumpOutput(bool flush)
else if (size == 0)
{
// Nothing at all was written. Increment wait time.
timeout_usec = std::min(flush_max_timeout, 2 * timeout_usec);
timeout_usec = llmin(flush_max_timeout, 2 * timeout_usec);
}
else
{
timeout_usec = std::max(flush_min_timeout, timeout_usec / 2);
timeout_usec = llmax(flush_min_timeout, timeout_usec / 2);
}
}
else if(APR_STATUS_IS_EOF(status))