From aa1e55ef1ad1d7d1f537ec3c5e43863674081314 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 19 Oct 1997 23:13:26 +0000 Subject: [PATCH] ChangeLog, .del-types.h.in~7a460879: Fix the type definitions of __s64 and __u64 if long long is used. ChangeLog, configure, configure.in: Add tests for sys/stat.h, sys/time.h, and sys/types.h --- ChangeLog | 4 ++++ configure | 2 +- configure.in | 2 +- include/linux/ChangeLog | 4 ++++ include/linux/types.h.in | 4 ++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d8bc15..064200b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 19 19:09:30 1997 Theodore Ts'o + + * configure.in: Add tests for sys/stat.h, sys/time.h, and sys/types.h + Tue Jun 17 01:33:20 1997 Theodore Ts'o * Release of E2fsprogs 1.11 diff --git a/configure b/configure index b030635..52a4632 100644 --- a/configure +++ b/configure @@ -1677,7 +1677,7 @@ else fi echo "$ac_t""$CPP" 1>&6 -for ac_hdr in stdlib.h unistd.h stdarg.h errno.h mntent.h dirent.h getopt.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h net/if.h netinet/in.h +for ac_hdr in stdlib.h unistd.h stdarg.h errno.h mntent.h dirent.h getopt.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/configure.in b/configure.in index 35f6f7e..0b81ac9 100644 --- a/configure.in +++ b/configure.in @@ -315,7 +315,7 @@ AC_CHECK_TOOL(STRIP, strip, :) AC_PROG_CC AC_PROG_INSTALL AC_C_CROSS -AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h mntent.h dirent.h getopt.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h net/if.h netinet/in.h) +AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h mntent.h dirent.h getopt.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h) AC_FUNC_VPRINTF dnl dnl See if struct dirent has a d_namlen field (like bsd systems), implying diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog index 4c23131..da5d24b 100644 --- a/include/linux/ChangeLog +++ b/include/linux/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 19 19:08:03 1997 Theodore Ts'o + + * Fix the type definitions of __s64 and __u64 if long long is used. + Tue Jun 17 01:33:20 1997 Theodore Ts'o * Release of E2fsprogs 1.11 diff --git a/include/linux/types.h.in b/include/linux/types.h.in index cd0feab..ee5f24d 100644 --- a/include/linux/types.h.in +++ b/include/linux/types.h.in @@ -11,8 +11,8 @@ typedef unsigned int __u64; typedef long __s64; typedef unsigned long __u64; #elif (@SIZEOF_LONG_LONG@ == 8) -typedef long __s64; -typedef unsigned long __u64; +typedef long long __s64; +typedef unsigned long long __u64; #endif #if (@SIZEOF_INT@ == 2) -- 1.8.3.1