From b8c34036a53f64f15292c1969e9d226e3cbdb521 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 14 Jan 2003 17:24:48 +0000
Subject: [PATCH] Cleanups.

committer: mfx <mfx> 1042565088 +0000
---
 src/s_win32.cpp | 4 ++++
 src/stdcxx.h    | 4 ++--
 src/tailor.h    | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/s_win32.cpp b/src/s_win32.cpp
index 55953de4..b71b09d9 100644
--- a/src/s_win32.cpp
+++ b/src/s_win32.cpp
@@ -42,6 +42,10 @@
 // direct screen access
 **************************************************************************/
 
+#if defined(_MSC_VER) && (_MSC_VER < 1200)
+#  pragma warning(disable: 4201) // nonstandard extension used: nameless struct/union
+#endif
+
 #include <windows.h>
 #if defined(HAVE_CONIO_H)
 #  include <conio.h>
diff --git a/src/stdcxx.h b/src/stdcxx.h
index c99b5d83..0f90e1b1 100644
--- a/src/stdcxx.h
+++ b/src/stdcxx.h
@@ -98,14 +98,14 @@ class bad_alloc { };
 #  define __USE_MALLOC
 #  define enable                upx_stl_enable
 #endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #  pragma warning(push)
 #  pragma warning(disable: 4018 4100 4663)
 #endif
 
 #include <vector>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #  pragma warning(pop)
 #endif
 
diff --git a/src/tailor.h b/src/tailor.h
index 82c434bd..a9ca33a4 100644
--- a/src/tailor.h
+++ b/src/tailor.h
@@ -152,7 +152,6 @@
 #  define SIGTYPEENTRY      __cdecl
 #  define HAVE_IO_H 1
 #  define HAVE_MALLOC_H 1
-#  define HAVE_UNISTD_H 1
 #  define HAVE_UTIME_H 1
 #  define HAVE_MODE_T 1
 #  define HAVE_CHMOD 1