Changes in lemon/graph_to_eps.h [562:b9b3473327e3:556:c5919679af17] in lemon

File:

• lemon/graph_to_eps.h (modified) (3 diffs)

lemon/graph_to_eps.h

@@ -30 +30 @@
 #include<ctime>
 #else
-#include<lemon/bits/windows.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include<windows.h>
 #endif
 
@@ -678 +684 @@
 
     {
-      os << "%%CreationDate: ";
 #ifndef WIN32
       timeval tv;
@@ -685 +690 @@
       char cbuf[26];
       ctime_r(&tv.tv_sec,cbuf);
-      os << cbuf;
+      os << "%%CreationDate: " << cbuf;
 #else
-      os << bits::getWinFormattedDate();
+      SYSTEMTIME time;
+      GetSystemTime(&time);
+#if defined(_MSC_VER) && (_MSC_VER < 1500)
+      LPWSTR buf1, buf2, buf3;
+      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        L"ddd MMM dd", buf1, 11) &&
+          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        L"HH':'mm':'ss", buf2, 9) &&
+          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        L"yyyy", buf3, 5)) {
+        os << "%%CreationDate: " << buf1 << ' '
+           << buf2 << ' ' << buf3 << std::endl;
+      }
+#else
+        char buf1[11], buf2[9], buf3[5];
+        if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "ddd MMM dd", buf1, 11) &&
+            GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "HH':'mm':'ss", buf2, 9) &&
+            GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "yyyy", buf3, 5)) {
+          os << "%%CreationDate: " << buf1 << ' '
+             << buf2 << ' ' << buf3 << std::endl;
+        }
 #endif
-    }
-    os << std::endl;
+#endif
+    }
 
     if (_autoArcWidthScale) {