Use consistent syntax for boolean preprocessor expressions.

src/s_win32.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN_WIN32)
+#if (USE_SCREEN_WIN32)
 
 #include "screen.h"
 
@@ -52,7 +52,7 @@
 #  define timeval win32_timeval  /* struct timeval already in <sys/time.h> */
 #endif
 #include <windows.h>
-#if defined(HAVE_CONIO_H)
+#if (HAVE_CONIO_H)
 #  include <conio.h>
 #endif
 
@@ -449,7 +449,7 @@ static int getScrollCounter(const screen_t *this)
 static int s_kbhit(screen_t *this)
 {
     UNUSED(this);
-#if defined(HAVE_CONIO_H)
+#if (HAVE_CONIO_H)
 # if defined(__RSXNT__)
     return 0;
 # elif defined(__BORLANDC__) || defined(__WATCOMC__)
@@ -526,7 +526,7 @@ screen_t *screen_win32_construct(void)
 }
 
 
-#endif /* defined(USE_SCREEN) && (ACC_OS_WIN32 || ACC_OS_WIN64) */
+#endif /* (USE_SCREEN_WIN32) */
 
 
 /*