From 883924dda62842a8d6fe2c9ae6fdac5335d801ae Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 26 Nov 2002 23:24:16 +0000
Subject: [PATCH] use STRICT

---
 src/libCom/osi/os/WIN32/dllmain.cpp  |  1 +
 src/libCom/osi/os/WIN32/osdEvent.c   |  2 +-
 src/libCom/osi/os/WIN32/osdMutex.c   | 15 ++++++++++++++-
 src/libCom/osi/os/WIN32/osdNetIntf.c |  2 +-
 src/libCom/osi/os/WIN32/osdProcess.c |  1 +
 src/libCom/osi/os/WIN32/osdSock.c    |  3 +--
 src/libCom/osi/os/WIN32/osdTime.cpp  |  4 ++--
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/libCom/osi/os/WIN32/dllmain.cpp b/src/libCom/osi/os/WIN32/dllmain.cpp
index d1a4e4cfe..9a598cb52 100644
--- a/src/libCom/osi/os/WIN32/dllmain.cpp
+++ b/src/libCom/osi/os/WIN32/dllmain.cpp
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #define VC_EXTRALEAN
+#define STRICT
 #include <winsock2.h>
 
 #include "epicsVersion.h"
diff --git a/src/libCom/osi/os/WIN32/osdEvent.c b/src/libCom/osi/os/WIN32/osdEvent.c
index c96e48d55..5abf0fdf1 100644
--- a/src/libCom/osi/os/WIN32/osdEvent.c
+++ b/src/libCom/osi/os/WIN32/osdEvent.c
@@ -21,7 +21,7 @@
 #include <limits.h>
 
 #define VC_EXTRALEAN
-#define _WIN32_WINNT 0x400 // currently not needed
+#define STRICT
 #include <windows.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/WIN32/osdMutex.c b/src/libCom/osi/os/WIN32/osdMutex.c
index 2a0b39ecb..66dc25e7d 100644
--- a/src/libCom/osi/os/WIN32/osdMutex.c
+++ b/src/libCom/osi/os/WIN32/osdMutex.c
@@ -22,7 +22,20 @@
 #include <limits.h>
 
 #define VC_EXTRALEAN
-#define _WIN32_WINNT 0x400
+#define STRICT
+/* 
+ * Defining this allows the *much* faster critical
+ * section mutex primitive to be used. Unfortunately,
+ * using certain of these functions drops support for W95 
+ * unless we specify "delay loading" when we link with the 
+ * DLL so that DLL entry points are not resolved until they 
+ * are used. The code does have run time switches so
+ * that the more advanced calls are not called unless 
+ * they are available in the windows OS, but this feature
+ * isnt going to be very useful unless we specify "delay 
+ * loading" when we link with the DLL
+ */
+#define _WIN32_WINNT 0x0400 
 #include <windows.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/WIN32/osdNetIntf.c b/src/libCom/osi/os/WIN32/osdNetIntf.c
index 115cec9a7..e5a3fdfe3 100644
--- a/src/libCom/osi/os/WIN32/osdNetIntf.c
+++ b/src/libCom/osi/os/WIN32/osdNetIntf.c
@@ -30,9 +30,9 @@
  * WIN32 specific
  */
 #define VC_EXTRALEAN
+#define STRICT
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <process.h>
 
 /*
  * EPICS
diff --git a/src/libCom/osi/os/WIN32/osdProcess.c b/src/libCom/osi/os/WIN32/osdProcess.c
index 61d55e113..0fb9886eb 100644
--- a/src/libCom/osi/os/WIN32/osdProcess.c
+++ b/src/libCom/osi/os/WIN32/osdProcess.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 
+#define STRICT
 #include <windows.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/WIN32/osdSock.c b/src/libCom/osi/os/WIN32/osdSock.c
index 5e7f2873c..1f303243f 100644
--- a/src/libCom/osi/os/WIN32/osdSock.c
+++ b/src/libCom/osi/os/WIN32/osdSock.c
@@ -30,9 +30,8 @@
  * WIN32 specific
  */
 #define VC_EXTRALEAN
+#define STRICT
 #include <winsock2.h>
-#include <ws2tcpip.h>
-#include <process.h>
 
 #define epicsExportSharedSymbols
 #include "osiSock.h"
diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp
index 0b7da0cb7..b6cca38eb 100644
--- a/src/libCom/osi/os/WIN32/osdTime.cpp
+++ b/src/libCom/osi/os/WIN32/osdTime.cpp
@@ -26,8 +26,8 @@
 // WIN32
 //
 #define VC_EXTRALEAN
-#include <winsock2.h>
-#include <process.h>
+#define STRICT
+#include <windows.h>
 
 //
 // EPICS