minor preprocessor changes for MinGW

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 1f45ecc22c17397c33f3366e0bb7d752c86aa4da..799edcc38bfc70c4179604faabf5b648ee0272bf 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -243,7 +243,7 @@ edge_t *debug_getedge(graph_t * g, char *s0, char *s1)
 }
 #endif
 
-#ifndef MSWIN32
+#if !defined(MSWIN32) && !defined(WIN32)
 #include       <pwd.h>
 static unsigned char userbuf[SMALLBUF];
 static agxbuf xb;
@@ -257,7 +257,7 @@ static void cleanup(void)
 char *gvUsername(void)
 {
     char *user = NULL;
-#ifndef MSWIN32
+#if !defined(MSWIN32) && !defined(WIN32)
     static int first = 1;
     struct passwd *p;
     if (first) {
@@ -595,7 +595,7 @@ static int Tflag;
 void gvToggle(int s)
 {
     Tflag = !Tflag;
-#ifndef MSWIN32
+#if !defined(MSWIN32) && !defined(WIN32)
     signal(SIGUSR1, gvToggle);
 #endif
 }

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index fccd18bc35c3f725237dc53c66df8aae85b30b6d..d171c75ecdfe958de8d3314688c53cc347072d06 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -415,7 +415,7 @@ extern "C" {
 #      endif
 #endif
 
-#ifdef S_IRUSR
+#if defined(S_IRUSR) && defined(S_IWUSR) && defined(S_IRGRP) && defined(S_IWGRP) && defined(S_IROTH) && defined(S_IWOTH)
 #define SF_CREATMODE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
 #else
 #define SF_CREATMODE   0666