From b756fe2b325cdc3c67661ec81749c1e28dd91c7b Mon Sep 17 00:00:00 2001
From: Marcin Kowalczyk <qrczak@google.com>
Date: Wed, 8 May 2024 10:40:46 +0200
Subject: [PATCH] Fix `#include` for Windows in `fd_handle.h`: `_S_IREAD` and
 `_S_IWRITE` are in `<sys/stat.h>`.

And in `fd_handle.cc`: `_SH_DENYNO` is in `<share.h>`.

Remove unused `#inculde <sys/types.h>` from `fd_writer.h`. It uses
`OwnedFd::Permissions` instead of `mode_t`.

Remove unused `#include <share.h>` where `OwnedFd::Open()` is used.

PiperOrigin-RevId: 631698415
---
 riegeli/bytes/fd_handle.cc      | 2 +-
 riegeli/bytes/fd_handle.h       | 4 +++-
 riegeli/bytes/fd_mmap_reader.cc | 1 -
 riegeli/bytes/fd_reader.cc      | 1 -
 riegeli/bytes/fd_writer.cc      | 1 -
 riegeli/bytes/fd_writer.h       | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/riegeli/bytes/fd_handle.cc b/riegeli/bytes/fd_handle.cc
index b645d589..4057a0df 100644
--- a/riegeli/bytes/fd_handle.cc
+++ b/riegeli/bytes/fd_handle.cc
@@ -21,9 +21,9 @@
 #include "riegeli/bytes/fd_handle.h"
 
 #include <fcntl.h>
-
 #ifdef _WIN32
 #include <io.h>
+#include <share.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/riegeli/bytes/fd_handle.h b/riegeli/bytes/fd_handle.h
index b0b103e9..ea4a9852 100644
--- a/riegeli/bytes/fd_handle.h
+++ b/riegeli/bytes/fd_handle.h
@@ -15,7 +15,9 @@
 #ifndef RIEGELI_BYTES_FD_HANDLE_H_
 #define RIEGELI_BYTES_FD_HANDLE_H_
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <sys/stat.h>
+#else
 #include <sys/types.h>
 #endif
 
diff --git a/riegeli/bytes/fd_mmap_reader.cc b/riegeli/bytes/fd_mmap_reader.cc
index eb960485..4c73d67e 100644
--- a/riegeli/bytes/fd_mmap_reader.cc
+++ b/riegeli/bytes/fd_mmap_reader.cc
@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #ifdef _WIN32
 #include <io.h>
-#include <share.h>
 #endif
 #include <stddef.h>
 #ifdef _WIN32
diff --git a/riegeli/bytes/fd_reader.cc b/riegeli/bytes/fd_reader.cc
index 16bda8d3..6fac10d6 100644
--- a/riegeli/bytes/fd_reader.cc
+++ b/riegeli/bytes/fd_reader.cc
@@ -40,7 +40,6 @@
 #include <fcntl.h>
 #ifdef _WIN32
 #include <io.h>
-#include <share.h>
 #endif
 #include <stddef.h>
 #include <stdio.h>
diff --git a/riegeli/bytes/fd_writer.cc b/riegeli/bytes/fd_writer.cc
index 590a8fd2..31688564 100644
--- a/riegeli/bytes/fd_writer.cc
+++ b/riegeli/bytes/fd_writer.cc
@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #ifdef _WIN32
 #include <io.h>
-#include <share.h>
 #endif
 #include <stddef.h>
 #include <stdio.h>
diff --git a/riegeli/bytes/fd_writer.h b/riegeli/bytes/fd_writer.h
index 09108228..3764ed06 100644
--- a/riegeli/bytes/fd_writer.h
+++ b/riegeli/bytes/fd_writer.h
@@ -20,7 +20,6 @@
 #ifdef _WIN32
 #include <sys/stat.h>
 #endif
-#include <sys/types.h>
 
 #include <string>
 #include <type_traits>