Differential D19706 Diff 59717 sys/contrib/zlib/zconf.h

Changeset View

Standalone View

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			# ifndef Z_SOLO
				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.
	# include <sys/types.h> /* for off_t */			# include <sys/types.h> /* for off_t */
	# endif			# endif
	#endif			#endif

	#if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)			#if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
	# ifndef Z_SOLO			# ifndef Z_SOLO
	# include <stdarg.h> /* for va_list */			# include <stdarg.h> /* for va_list */
	# endif			# endif
	▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
	# define SEEK_SET 0 /* Seek from beginning of file. */			# define SEEK_SET 0 /* Seek from beginning of file. */
	# define SEEK_CUR 1 /* Seek from current position. */			# define SEEK_CUR 1 /* Seek from current position. */
	# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */			# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
	#endif			#endif

	/*			/*
	* This is hard-configured for FreeBSD.			* This is hard-configured for FreeBSD.
	*/			*/
				#ifdef Z_SOLO
				# include <sys/types.h> /* for off_t */
				# ifdef _KERNEL
				/* avoid conflict with sys/sys/inflate.h
				# define inflate z_inflate
				*/
				# endif
				#endif

	#define z_off_t off_t			#define z_off_t off_t
	#ifndef _FILE_OFFSET_BITS			#ifndef _FILE_OFFSET_BITS
	#define _FILE_OFFSET_BITS 64			#define _FILE_OFFSET_BITS 64
	#endif			#endif

	#ifndef z_off_t			#ifndef z_off_t
	# define z_off_t long			# define z_off_t long
	#endif			#endif
	Show All 29 Lines