Windows Phalanx engine code fixes FINAL ATTEMPT 3

Author: whelanh

engines/phalanx-scid/evaluate.c

@@ -303,7 +303,9 @@ if(Flag.polling)
       DWORD read;
       if (PeekNamedPipe(h, buf, 255, &read, &nBytes, NULL)) {
         buf[read] = '\0';
-        if (strchr(buf, '\n') || strchr(buf, '\r')) interrupt(0);
+        if (strchr(buf, '\n') || strchr(buf, '\r')) {
+            interrupt(0);
+        }
       }
     }
   }
@@ -318,7 +320,9 @@ if(Flag.polling)
   tv.tv_usec=0;
   select(16, &readfds, 0, 0, &tv);
   data=FD_ISSET(fileno(stdin), &readfds);
-  if(data) interrupt(0);
+  if(data) {
+    interrupt(0);
+  }
 #endif
 	if( Abort && ! NoAbort ) return 0;
 }

engines/phalanx-scid/phalanx.c

@@ -6,10 +6,6 @@
  */
 
 #include "phalanx.h"
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#endif
 
 /* 2005-09-14, José de Paula
  * GCC 3.0 deprecated multi-line strings, and, as of GCC 3.4, they are no longer supported.

engines/phalanx-scid/phalanx.h

@@ -1,15 +1,31 @@
 #ifndef PHALANX_INCLUDED
 #define PHALANX_INCLUDED
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef _WIN32
+  #include <windows.h>
+  #include <fcntl.h>
+  #include <io.h>
+#else
+  #include <unistd.h>
+  #include <sys/time.h>
+#endif
+
 #define VERSION "XXII-pg"
 
 #ifdef GNUFUN
   #include <getopt.h>
 #endif
 
 #ifdef _WIN32
-  #include <windows.h>
-
   #ifndef GNUFUN
     extern int opterr;
     extern int optind;
@@ -25,21 +41,10 @@
   #define clearTimeout(DUMMY)
 
 #else
-  #include <unistd.h>
-  #include <sys/time.h>
   #define setTimeout(FN, SEC) signal(SIGALRM,FN); alarm(SEC);
   #define clearTimeout(DUMMY) alarm(0);
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 /*
  * COMPATIBILITY
  */