Accommodate some newly introduced source files for building with MSVC (libpbd)

diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index 244328d41bc10abb05d05014143beef41e5e62c2..4e3866d01bacd6fcd73fd1610c170c1b40e4678c 100644 (file)
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -450,6 +450,14 @@
                                RelativePath="..\textreceiver.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\timer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\timing.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\transmitter.cc"
                                >
@@ -800,6 +808,14 @@
                                RelativePath="..\pbd\textreceiver.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\pbd\timer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\pbd\timing.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\pbd\tokenizer.h"
                                >

diff --git a/libs/pbd/timing.cc b/libs/pbd/timing.cc
index b811c09f9612a78a5a44e7367ad11b091243ffb7..c6f76211c2323fb58335c41cbb5f75399a369f6d 100644 (file)
--- 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