Fix problems involving unistd.h. Remove traces of it (R_OK) from

ast_common.h.in, and use compat_unistd.h in gvpr.c if the real
one isn't around.

diff --git a/ast_common.h.in b/ast_common.h.in
index f57967e51ac768cb8a536ca83026d12deea27844..5f0c832ab631b4c139095722dced05273379b1c8 100644 (file)
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -211,8 +211,4 @@ typedef int ssize_t;
 #define MAXINT INT_MAX
 #endif
 
-#ifndef R_OK
-#define R_OK 4
-#endif
-
 #endif /*AST_COMMON_H*/

diff --git a/cmd/gvpr/gvpr.c b/cmd/gvpr/gvpr.c
index 4628628bb29b44bcdb3b1c62478ad5f754b3011e..ddf2a1cc7c0b3fe6643557a16b7bed97908a0ac2 100644 (file)
--- a/cmd/gvpr/gvpr.c
+++ b/cmd/gvpr/gvpr.c
@@ -26,6 +26,8 @@
 #endif
 #ifdef HAVE_UNISTD_H
 #include       <unistd.h>
+#else
+#include       <compat_unistd.h>
 #endif
 #include <gprstate.h>
 #ifdef USE_CGRAPH