mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move zconf.h to libretro-common/include/compat"

Browse Source 
This reverts commit 15c00bc9970d0c350f3b6c19131b219db2b162f6.
This commit is contained in:
twinaphex 2015-08-31 19:40:07 +02:00
parent 15c00bc997
commit 2b80e89f13
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretro-common/include/compat/zconf.h → deps/zlib/zconf.h vendored
View File

@ -1,7 +1,3 @@
#ifndef _COMPAT_ZLIB_H
#define _COMPAT_ZLIB_H
#ifdef WANT_ZLIB
/* zconf.h -- configuration of the zlib compression library /* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2013 Jean-loup Gailly. * Copyright (C) 1995-2013 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
@ -513,9 +509,3 @@ typedef uLong FAR uLongf;
#endif #endif
#endif /* ZCONF_H */ #endif /* ZCONF_H */
#else
#include <zconf.h>
#endif
#endif

2
libretro-common/include/compat/zlib.h
View File

@ -36,7 +36,7 @@
#ifndef ZLIB_H #ifndef ZLIB_H
#define ZLIB_H #define ZLIB_H
#include <compat/zconf.h> #include "zconf.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {