Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 18:10:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added NOMINMAX before things that possibly include windows.h

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-10 21:01:43 -08:00
parent ac97f129d3
commit 7848d065bc
2 changed files with 70 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/octree-server/src/OctreeServer.cpp
View file

@ -6,14 +6,17 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
//
#ifdef _WIN32
#define NOMINMAX // this is required as long as we have civetweb because it includes windows.h, this also must be before QTimer
#endif
#include "civetweb.h"
#include <QtCore/QTimer>
#include <QtCore/QUuid>
#include <Logging.h>
#include <UUID.h>
#include "civetweb.h"
#include "OctreeServer.h"
#include "OctreeServerConsts.h"

1
libraries/shared/src/Systime.cpp
View file

@ -1,4 +1,5 @@
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#define _timeval_
#include "Systime.h"