2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2557b698..97f03e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 10 21:37:49 2011  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awk.h: Rearrange includes of <fcntl.h> so it won't be
+	included for VMS, move definition of O_BINARY down.
+
 Sat Jan  8 23:00:37 2011  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* awk.h: Include <fcntl.h> here.
diff --git a/awk.h b/awk.h
index 8ac94e5b..84a7d18e 100644
--- a/awk.h
+++ b/awk.h
@@ -49,12 +49,6 @@
 #endif /* HAVE_LIMITS_H */
 #include <ctype.h>
 #include <setjmp.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifndef O_BINARY
-#define O_BINARY	0
-#endif
 
 #include "gettext.h"
 #define _(msgid)  gettext(msgid)
@@ -115,6 +109,9 @@ extern int errno;
 #define MALLOC_ARG_T size_t
 
 #ifndef VMS
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #else	/* VMS */
@@ -162,6 +159,10 @@ typedef int off_t;
 #include "vms/redirect.h"
 #endif  /*VMS*/
 
+#ifndef O_BINARY
+#define O_BINARY	0
+#endif
+
 #ifndef HAVE_VPRINTF
 #error "you lose: you need a system with vfprintf"
 #endif	/* HAVE_VPRINTF */