Pollute more places with off64_t and add __off64_t

Despite the private namespace, several broken ports depend on the __off64_t
name for the type.  Export it exactly the same way off_t and __off_t are
exported.

A follow-up to r299456.

Suggested by:	php56
Sponsored by:	EMC / Isilon Storage Division

3 files changed, 7 insertions, 1 deletions

diff --git a/include/stdio.h b/include/stdio.h
index 724138631c36..bbeb2a271ece 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -60,7 +60,7 @@ typedef	__ssize_t	ssize_t;
 
 #ifndef _OFF64_T_DECLARED
 #define	_OFF64_T_DECLARED
-typedef	__off_t		off64_t;
+typedef	__off64_t	off64_t;
 #endif
 
 #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 16039a6da16b..ecc1c7e05e4c 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -51,6 +51,7 @@ typedef	int		__accmode_t;	/* access permissions */
 typedef	int		__nl_item;
 typedef	__uint16_t	__nlink_t;	/* link count */
 typedef	__int64_t	__off_t;	/* file offset */
+typedef	__int64_t	__off64_t;	/* file offset (alias) */
 typedef	__int32_t	__pid_t;	/* process [group] */
 typedef	__int64_t	__rlim_t;	/* resource limit - intentionally */
 					/* signed, because of legacy code */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 579b104924af..6e2c01219c3b 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -174,6 +174,11 @@ typedef	__off_t		off_t;		/* file offset */
 #define	_OFF_T_DECLARED
 #endif
 
+#ifndef _OFF64_T_DECLARED
+typedef	__off64_t	off64_t;	/* file offset (alias) */
+#define	_OFF64_T_DECLARED
+#endif
+
 #ifndef _PID_T_DECLARED
 typedef	__pid_t		pid_t;		/* process id */
 #define	_PID_T_DECLARED