David Byron's patch for typos and one re-arrangement in Windows code in

pcregrep.


git-svn-id: svn://vcs.exim.org/pcre/code/trunk@283 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 8 insertions, 6 deletions

diff --git a/pcregrep.c b/pcregrep.c
index 88edc8f..5342607 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -322,8 +322,9 @@ return isatty(fileno(stdout));
 
 /* I (Philip Hazel) have no means of testing this code. It was contributed by
 Lionel Fourquaux. David Burgess added a patch to define INVALID_FILE_ATTRIBUTES
-when it did not exist. */
-
+when it did not exist. David Byron added a patch that moved the #include of 
+<windows.h> to before the INVALID_FILE_ATTRIBUTES definition rather than after. 
+*/
 
 #elif HAVE_WINDOWS_H
 
@@ -333,12 +334,13 @@ when it did not exist. */
 #ifndef WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
+
+#include <windows.h>
+
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
 #endif
 
-#include <windows.h>
-
 typedef struct directory_type
 {
 HANDLE handle;
@@ -423,7 +425,7 @@ regular if they are not directories. */
 
 int isregfile(char *filename)
 {
-return !isdirectory(filename)
+return !isdirectory(filename);
 }
 
 
@@ -434,7 +436,7 @@ return !isdirectory(filename)
 static BOOL
 is_stdout_tty(void)
 {
-FALSE;
+return FALSE;
 }