Page MenuHomeFreeBSD
Differential D19706 Diff 56446 sys/contrib/zlib/zconf.h

Changeset View

Standalone View

View Options

sys/contrib/zlib/zconf.h

Show First 20 Lines • Show All 433 Lines • ▼ Show 20 Lines
#if 0 /* was set to #if 0 by ./configure */ #if 0 /* was set to #if 0 by ./configure */
# define Z_HAVE_UNISTD_H # define Z_HAVE_UNISTD_H
#endif #endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H # define Z_HAVE_STDARG_H
#endif #endif
#ifdef STDC #ifdef STDC
# ifndef Z_SOLO
# include <sys/types.h> /* for off_t */ # include <sys/types.h> /* for off_t */
delphijAuthorUnsubmitted
Not Done
Inline Actions

This seems to be my bad (rS206708 derived from vendor 7147f24cd7b27dd95f6e841851a111cb311a9c07).

Initially, in rS205306, we #if 0'ed Z_HAVE_UNISTD_H, which used to determine if we would include sys/types.h. Later, the upstream have decided to include it for all platforms, and sys/types.h was included again, so when upgrading zlib I have decided to just take it and removed the include below, right before our hardcoded configuration.

May I ask a favor that we revert the change here to vendor version, and instead, add a block of:

#ifdef Z_SOLO
#  include <sys/types.h>      /* for off_t */
#endif

under "This is hard-configured for FreeBSD." so we keep the local changes together? Potentially, that would make it easier for future upgrades.

delphij: This seems to be my bad (rS206708 derived from vendor 7147f24cd7b27dd95f6e841851a111cb311a9c07).
ota_j.email.ne.jpUnsubmitted
Done
Inline Actions

Ok.

ota_j.email.ne.jp: Ok.
# endif #endif
#endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H) #if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO # if !defined(Z_SOLO) && !defined(NO_GZIP)
# include <stdarg.h> /* for va_list */ # include <stdarg.h> /* for va_list */
# endif # endif
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# ifndef Z_SOLO # ifndef Z_SOLO
# include <stddef.h> /* for wchar_t */ # include <stddef.h> /* for wchar_t */
# endif # endif
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines