From 2b80e89f13bc01bfbc795e53486c438a11f76d37 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 31 Aug 2015 19:40:07 +0200
Subject: [PATCH] Revert "Move zconf.h to libretro-common/include/compat"

This reverts commit 15c00bc9970d0c350f3b6c19131b219db2b162f6.
---
 {libretro-common/include/compat => deps/zlib}/zconf.h | 10 ----------
 libretro-common/include/compat/zlib.h                 |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)
 rename {libretro-common/include/compat => deps/zlib}/zconf.h (99%)

diff --git a/libretro-common/include/compat/zconf.h b/deps/zlib/zconf.h
similarity index 99%
rename from libretro-common/include/compat/zconf.h
rename to deps/zlib/zconf.h
index 8aaa8157e4..9987a77553 100644
--- a/libretro-common/include/compat/zconf.h
+++ b/deps/zlib/zconf.h
@@ -1,7 +1,3 @@
-#ifndef _COMPAT_ZLIB_H
-#define _COMPAT_ZLIB_H
-
-#ifdef WANT_ZLIB
 /* zconf.h -- configuration of the zlib compression library
  * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -513,9 +509,3 @@ typedef uLong FAR uLongf;
 #endif
 
 #endif /* ZCONF_H */
-
-#else
-#include <zconf.h>
-#endif
-
-#endif
diff --git a/libretro-common/include/compat/zlib.h b/libretro-common/include/compat/zlib.h
index d210c8af71..bf3d53db40 100644
--- a/libretro-common/include/compat/zlib.h
+++ b/libretro-common/include/compat/zlib.h
@@ -36,7 +36,7 @@
 #ifndef ZLIB_H
 #define ZLIB_H
 
-#include <compat/zconf.h>
+#include "zconf.h"
 
 #ifdef __cplusplus
 extern "C" {