From 983172d0c2a556692acc161c33bc629578f83897 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Thu, 25 Jul 2019 09:35:33 -0700
Subject: [PATCH] deps/libz: Move zutil.h back to deps.

This is an internal zlib header and should not be used by other projects.

See the comment in the file.

/* WARNING: this file should *not* be used by applications. It is
   part of the implementation of the compression library and is
   subject to change. Applications should only use zlib.h.
 */
---
 deps/libz/adler32.c                                        | 2 +-
 deps/libz/deflate.h                                        | 2 +-
 deps/libz/inffast.c                                        | 2 +-
 deps/libz/inflate.c                                        | 2 +-
 deps/libz/inftrees.c                                       | 2 +-
 deps/libz/zutil.c                                          | 2 +-
 {libretro-common/include/compat/zlib => deps/libz}/zutil.h | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {libretro-common/include/compat/zlib => deps/libz}/zutil.h (100%)

diff --git a/deps/libz/adler32.c b/deps/libz/adler32.c
index 10b45d05e2..3958febd72 100644
--- a/deps/libz/adler32.c
+++ b/deps/libz/adler32.c
@@ -8,7 +8,7 @@
 #define ZLIB_INTERNAL
 #include <stdint.h>
 #include <stddef.h>
-#include <zutil.h>
+#include "zutil.h"
 
 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
diff --git a/deps/libz/deflate.h b/deps/libz/deflate.h
index 8f6196e030..82fe93e224 100644
--- a/deps/libz/deflate.h
+++ b/deps/libz/deflate.h
@@ -13,7 +13,7 @@
 #ifndef DEFLATE_H
 #define DEFLATE_H
 
-#include <zutil.h>
+#include "zutil.h"
 
 /* define NO_GZIP when compiling if you want to disable gzip header and
    trailer creation by deflate().  NO_GZIP would be used to avoid linking in
diff --git a/deps/libz/inffast.c b/deps/libz/inffast.c
index 045b61ac01..a88859f37d 100644
--- a/deps/libz/inffast.c
+++ b/deps/libz/inffast.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <zutil.h>
+#include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
diff --git a/deps/libz/inflate.c b/deps/libz/inflate.c
index 4322aed69f..183a75784b 100644
--- a/deps/libz/inflate.c
+++ b/deps/libz/inflate.c
@@ -80,7 +80,7 @@
    * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
    */
 
-#include <zutil.h>
+#include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
diff --git a/deps/libz/inftrees.c b/deps/libz/inftrees.c
index d747b6bdad..8b8a9648f1 100644
--- a/deps/libz/inftrees.c
+++ b/deps/libz/inftrees.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <zutil.h>
+#include "zutil.h"
 #include "inftrees.h"
 
 #define MAXBITS 15
diff --git a/deps/libz/zutil.c b/deps/libz/zutil.c
index d5b5fffc52..79cc2e8d85 100644
--- a/deps/libz/zutil.c
+++ b/deps/libz/zutil.c
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include <zutil.h>
+#include "zutil.h"
 #ifndef Z_SOLO
 #  include "gzguts.h"
 #endif
diff --git a/libretro-common/include/compat/zlib/zutil.h b/deps/libz/zutil.h
similarity index 100%
rename from libretro-common/include/compat/zlib/zutil.h
rename to deps/libz/zutil.h