From 5231f567fc3f5eaea9731bade6bad0c308303886 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 7 Oct 2020 15:26:39 +0200
Subject: [PATCH] Add zlib headers

---
 Makefile.common                                     |  3 ++-
 .../include/compat/{ => zlib}/zconf.h               |  0
 .../include/compat/{ => zlib}/zconf.h.in            |  0
 .../include/compat/{ => zlib}/zlib.h                | 13 +------------
 .../include/compat/{ => zlib}/zutil.h               |  2 +-
 5 files changed, 4 insertions(+), 14 deletions(-)
 rename libretro/libretro-common/include/compat/{ => zlib}/zconf.h (100%)
 rename libretro/libretro-common/include/compat/{ => zlib}/zconf.h.in (100%)
 rename libretro/libretro-common/include/compat/{ => zlib}/zlib.h (99%)
 rename libretro/libretro-common/include/compat/{ => zlib}/zutil.h (99%)

diff --git a/Makefile.common b/Makefile.common
index 63704cb..e39db35 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,7 +3,8 @@ LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro/libretro-common
 INCFLAGS := -I$(CORE_DIR) \
             -I$(CORE_DIR)/atari800/src \
             -I$(CORE_DIR)/libretro  \
-            -I$(LIBRETRO_COMM_DIR)/include
+            -I$(LIBRETRO_COMM_DIR)/include \
+            -I$(LIBRETRO_COMM_DIR)/include/compat/zlib \
 
 ifeq ($(STATIC_LINKING), 1)
 INCFLAGS += -I$(CORE_DIR)/libretro/include
diff --git a/libretro/libretro-common/include/compat/zconf.h b/libretro/libretro-common/include/compat/zlib/zconf.h
similarity index 100%
rename from libretro/libretro-common/include/compat/zconf.h
rename to libretro/libretro-common/include/compat/zlib/zconf.h
diff --git a/libretro/libretro-common/include/compat/zconf.h.in b/libretro/libretro-common/include/compat/zlib/zconf.h.in
similarity index 100%
rename from libretro/libretro-common/include/compat/zconf.h.in
rename to libretro/libretro-common/include/compat/zlib/zconf.h.in
diff --git a/libretro/libretro-common/include/compat/zlib.h b/libretro/libretro-common/include/compat/zlib/zlib.h
similarity index 99%
rename from libretro/libretro-common/include/compat/zlib.h
rename to libretro/libretro-common/include/compat/zlib/zlib.h
index 6984084..800bdf5 100644
--- a/libretro/libretro-common/include/compat/zlib.h
+++ b/libretro/libretro-common/include/compat/zlib/zlib.h
@@ -1,12 +1,6 @@
 #ifndef _COMPAT_ZLIB_H
 #define _COMPAT_ZLIB_H
 
-#ifdef WANT_ZLIB
-
-#ifdef RARCH_INTERNAL
-#include "zconf.h.in"
-#endif
-
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.8, April 28th, 2013
 
@@ -1742,9 +1736,8 @@ uint32_t adler32 (uint32_t adler, const uint8_t *buf, size_t len);
  const char   *  zError           (int);
  int             inflateSyncPoint (z_streamp);
 
- const uint32_t * get_crc_table(void);
+const uint32_t * get_crc_table(void);
  int             inflateUndermine (z_streamp, int);
- int             inflateValidate  (z_streamp, int);
  int             inflateResetKeep (z_streamp);
  int             deflateResetKeep (z_streamp);
 #if defined(_WIN32) && !defined(Z_SOLO)
@@ -1765,8 +1758,4 @@ uint32_t adler32 (uint32_t adler, const uint8_t *buf, size_t len);
 
 #endif /* ZLIB_H */
 
-#else
-#include <zlib.h>
-#endif
-
 #endif
diff --git a/libretro/libretro-common/include/compat/zutil.h b/libretro/libretro-common/include/compat/zlib/zutil.h
similarity index 99%
rename from libretro/libretro-common/include/compat/zutil.h
rename to libretro/libretro-common/include/compat/zlib/zutil.h
index bce9a48..bc67f5a 100644
--- a/libretro/libretro-common/include/compat/zutil.h
+++ b/libretro/libretro-common/include/compat/zlib/zutil.h
@@ -24,7 +24,7 @@
 #  define ZLIB_INTERNAL
 #endif
 
-#include <compat/zlib.h>
+#include <zlib.h>
 
 #if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))