Skip to content

Commit cc87aa1

Browse files
committed
Smallest I could get the diff before breaking
Signed-off-by: Andrew Innes <[email protected]>
1 parent 9059507 commit cc87aa1

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

lib/os/windows/zlib-1.2.3/zconf.h

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,21 @@ typedef uLong FAR uLongf;
447447
# define Z_HAVE_STDARG_H
448448
#endif
449449

450+
#ifdef STDC
451+
# ifndef Z_SOLO
452+
# endif
453+
#endif
454+
455+
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
456+
# ifndef Z_SOLO
457+
# endif
458+
#endif
459+
460+
#ifdef _WIN32
461+
# ifndef Z_SOLO
462+
# endif
463+
#endif
464+
450465
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
451466
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
452467
* though the former does not conform to the LFS document), but considering
@@ -470,13 +485,15 @@ typedef uLong FAR uLongf;
470485

471486
#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
472487
# include <sys/types.h> /* for off_t */
473-
# include <unistd.h> /* for SEEK_* and off_t */
488+
# if defined(Z_HAVE_UNISTD_H)
489+
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
474490
# ifdef VMS
475491
# include <unixio.h> /* for off_t */
476492
# endif
477493
# ifndef z_off_t
478494
# define z_off_t off_t
479495
# endif
496+
# endif
480497
#endif
481498

482499
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0

0 commit comments

Comments
 (0)