summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/pbd/MSVCpbd/pbd.vcproj16
-rw-r--r--libs/pbd/timing.cc5
2 files changed, 21 insertions, 0 deletions
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index 244328d41b..4e3866d01b 100644
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -451,6 +451,14 @@
>
</File>
<File
+ RelativePath="..\timer.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\timing.cc"
+ >
+ </File>
+ <File
RelativePath="..\transmitter.cc"
>
</File>
@@ -801,6 +809,14 @@
>
</File>
<File
+ RelativePath="..\pbd\timer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\pbd\timing.h"
+ >
+ </File>
+ <File
RelativePath="..\pbd\tokenizer.h"
>
</File>
diff --git a/libs/pbd/timing.cc b/libs/pbd/timing.cc
index b811c09f96..c6f76211c2 100644
--- a/libs/pbd/timing.cc
+++ b/libs/pbd/timing.cc
@@ -22,6 +22,11 @@
#include <sstream>
#include <limits>
+#ifdef COMPILER_MSVC
+#undef min
+#undef max
+#endif
+
namespace PBD {
bool