commit 16fa29a9bb2004e1478a8bd237d0e3df907381c0
author Laszlo Csomor <laszlocsomor@google.com> Tue Mar 12 06:39:48 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 12 06:41:30 2019 -0700
tree 1ee3b33a823aff314109438c6c903d751353539a
parent 7fb242d404962666636bb77e05845e7f2217381c

Windows, JNI library: fix with WIN32_LEAN_AND_MEAN

Bazel's JNI library can now be compiled with
`--copt=-DWIN32_LEAN_AND_MEAN`.

Closes #7695.

PiperOrigin-RevId: 238003483

src/main/native/windows/file-jni.cc

diff --git a/src/main/native/windows/file-jni.cc b/src/main/native/windows/file-jni.cc
index 99b95d8..09934ec 100644
--- a/src/main/native/windows/file-jni.cc
+++ b/src/main/native/windows/file-jni.cc
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 
 #include <windows.h>
 

src/main/native/windows/file.cc

diff --git a/src/main/native/windows/file.cc b/src/main/native/windows/file.cc
index c0d41a3..efe99c9 100644
--- a/src/main/native/windows/file.cc
+++ b/src/main/native/windows/file.cc
@@ -12,8 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stdint.h>  // uint8_t
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <windows.h>
+#include <WinIoCtl.h>
+
+#include <stdint.h>  // uint8_t
 
 #include <memory>
 #include <sstream>

src/main/native/windows/jni-util.cc

diff --git a/src/main/native/windows/jni-util.cc b/src/main/native/windows/jni-util.cc
index a60fc49..85aaaef 100644
--- a/src/main/native/windows/jni-util.cc
+++ b/src/main/native/windows/jni-util.cc
@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <windows.h>
 
 #include <algorithm>

src/main/native/windows/processes-jni.cc

diff --git a/src/main/native/windows/processes-jni.cc b/src/main/native/windows/processes-jni.cc
index 045bd02..281fc85 100644
--- a/src/main/native/windows/processes-jni.cc
+++ b/src/main/native/windows/processes-jni.cc
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 
 #include <wchar.h>
 #include <windows.h>