Support building with Visual Studio 2005+

diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c
index 4169989f2b7dc501f07fb9d7433193c7352aaa10..56f84d9026d8602b5c16e61bc823813ce304d971 100644 (file)
--- a/lib/fdpgen/tlayout.c
+++ b/lib/fdpgen/tlayout.c
@@ -552,7 +552,7 @@ static pointf initPositions(graph_t * g, bport_t * pp)
     if (T_smode == INIT_RANDOM)
        local_seed = T_seed;
     else {
-#ifdef MSWIN32
+#if defined(MSWIN32) || defined(WIN32)
        local_seed = time(NULL);
 #else
        local_seed = getpid() ^ time(NULL);

diff --git a/lib/graph/graph.h b/lib/graph/graph.h
index b0566875442aaab7c8b75f910dc6a174a2cfc7ba..eafdec4c0c03401f1a6441ab4d1262ab8db28e12 100644 (file)
--- a/lib/graph/graph.h
+++ b/lib/graph/graph.h
@@ -214,7 +214,7 @@ extern "C" {
     extern void agseterr(agerrlevel_t);
     extern char *aglasterr(void);
     extern int agerr(agerrlevel_t level, char *fmt, ...);
-    extern void agerrorf(char *fmt, ...);
+    extern void agerrorf(const char *fmt, ...);
     extern void agwarningf(char *fmt, ...);
 
     extern char *agstrdup(char *);

diff --git a/lib/graph/libgraph.h b/lib/graph/libgraph.h
index 77d810aa10065b577025122d986d89e60ba5281a..cdf4c30644fd91a499ca9398308f2ef1b5480ff7 100644 (file)
--- a/lib/graph/libgraph.h
+++ b/lib/graph/libgraph.h
@@ -28,7 +28,7 @@ extern "C" {
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef MSWIN32
+#if !defined(MSWIN32) && !defined(WIN32)
 #include <unistd.h>
 #endif
 #endif