#
#
# patch "dates.cc"
#  from [5417b21d6399295c8e6bee9e611d0067b8a11581]
#    to [54a267e8cda2c82890e7bfd13a0ca08a53c5aa26]
#
============================================================
--- dates.cc	5417b21d6399295c8e6bee9e611d0067b8a11581
+++ dates.cc	54a267e8cda2c82890e7bfd13a0ca08a53c5aa26
@@ -37,6 +37,17 @@
 //    CVS/RCS ,v files, which encode times as decimal seconds since the Unix
 //    epoch; so we must support that epoch regardless of what the system does.
 
+
+// On Solaris, these macros are already defined by system includes. We want
+// to use our own, so we undef them here.
+#ifdef SEC
+#undef SEC
+#endif
+
+#ifdef MILLISEC
+#undef MILLISEC
+#endif
+
 using std::string;
 
 // Writing a 64-bit constant is tricky.  We cannot use the macros that