Merge pull request #1003 from xarblu/zlib-ng

Fix build with zlib-ng.
This commit is contained in:
bearoso 2025-11-08 08:56:50 -06:00 committed by GitHub
commit 83ebd9d9d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions

View File

@ -12,6 +12,7 @@
#include <vector>
#include <string>
#include "snes9x.h"
#ifdef UNZIP_SUPPORT
# ifdef SYSTEM_ZIP
# include <minizip/unzip.h>
@ -19,7 +20,6 @@
# include "unzip/unzip.h"
# endif
#endif
#include "snes9x.h"
#ifndef MAX
# define MAX(a,b) ((a) > (b)? (a) : (b))

View File

@ -8,12 +8,12 @@
#include <assert.h>
#include <ctype.h>
#include "snes9x.h"
#ifdef SYSTEM_ZIP
#include <minizip/unzip.h>
#else
#include "unzip/unzip.h"
#endif
#include "snes9x.h"
#include "memmap.h"

View File

@ -10,6 +10,7 @@
#include <numeric>
#include <assert.h>
#include "snes9x.h"
#ifdef UNZIP_SUPPORT
# ifdef SYSTEM_ZIP
# include <minizip/unzip.h>
@ -25,7 +26,6 @@
#include <ctype.h>
#include <sys/stat.h>
#include "snes9x.h"
#include "memmap.h"
#include "apu/apu.h"
#include "fxemu.h"

View File

@ -7,6 +7,7 @@
// Abstract the details of reading from zip files versus FILE *'s.
#include <string>
#include "snes9x.h"
#ifdef UNZIP_SUPPORT
# ifdef SYSTEM_ZIP
# include <minizip/unzip.h>
@ -14,7 +15,6 @@
# include "unzip.h"
# endif
#endif
#include "snes9x.h"
#include "stream.h"