More Win32 build improvements

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 14c58731792c9f81e7d6a6548dbba5e0aad91b70..0fcd5c221a81175dc21658269b62cf0787f6a062 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -37,6 +37,9 @@
 #ifdef ZTS
 
 #ifdef TSRM_WIN32
+# ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # include <windows.h>
 #elif defined(NETWARE)
 # include <nks/thread.h>

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 00efb9136ebad0641daa5716916570d280935a76..0cffe4722a040a014fdeb78ffef10b6f2eeb6d4c 100644 (file)
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -24,6 +24,8 @@
 #include <process.h>
 #include <time.h>
 
+#define TSRM_INCLUDE_FULL_WINDOWS_HEADERS
+
 #include "TSRM.h"
 
 #ifdef TSRM_WIN32
@@ -84,6 +86,7 @@ TSRM_API void tsrm_win32_shutdown(void)
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
        SHFILEINFO sfi;
+
        if (mode == 1 /*X_OK*/) {
                return access(pathname, 0) == 0 && 
                        SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;