Merge pull request #2451 from ZappoMan/windows_fixes

Windows run time fixes
This commit is contained in:
Philip Rosedale 2014-03-23 19:01:11 -07:00
commit 66b863eea8
4 changed files with 9 additions and 4 deletions

View file

@ -15,8 +15,10 @@
int main(int argc, char* argv[]) {
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0);
#endif
// use the verbose message handler in Logging
qInstallMessageHandler(Logging::verboseMessageHandler);

View file

@ -880,7 +880,9 @@ void OctreeServer::run() {
// we need to ask the DS about agents so we can ping/reply with them
nodeList->addNodeTypeToInterestSet(NodeType::Agent);
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0);
#endif
nodeList->linkedDataCreateCallback = &OctreeServer::attachQueryNodeToNode;

View file

@ -20,10 +20,11 @@
int main(int argc, char* argv[]) {
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0);
#endif
qInstallMessageHandler(Logging::verboseMessageHandler);
DomainServer domainServer(argc, argv);
return domainServer.exec();

View file

@ -86,7 +86,7 @@ const char* stringForLogType(QtMsgType msgType) {
}
// the following will produce 2000-10-02 13:55:36 -0700
const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z";
const char DATE_STRING_FORMAT[] = "%Y-%m-%d %H:%M:%S %z";
void Logging::verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
if (message.isEmpty()) {