Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 412966 Details for
Bug 560358
<sys-fs/xfsdump-3.1.5: build fails w/xfsprogs-4.2.0: drive_minrmt.c:1972:2: error: unknown type name '__psint_t'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[JANKYFIX-000 #2 of 3] xfsdump-3.1.4-xfsprogs-4.patch
xfsdump-3.1.4-xfsprogs-4.patch (text/plain), 30.83 KB, created by
Greg Turner
on 2015-09-26 09:18:11 UTC
(
hide
)
Description:
[JANKYFIX-000 #2 of 3] xfsdump-3.1.4-xfsprogs-4.patch
Filename:
MIME Type:
Creator:
Greg Turner
Created:
2015-09-26 09:18:11 UTC
Size:
30.83 KB
patch
obsolete
>diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/cldmgr.c xfsdump-3.1.4/common/cldmgr.c >--- xfsdump-3.1.4.orig/common/cldmgr.c 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/common/cldmgr.c 2015-09-21 18:58:42.505301111 -0700 >@@ -25,6 +25,9 @@ > #include <sys/prctl.h> > #include <errno.h> > #include <pthread.h> >+#include <assert.h> >+#include <string.h> >+#include <unistd.h> > > #include "exit.h" > #include "types.h" >@@ -33,6 +36,7 @@ > #include "stream.h" > #include "mlog.h" > #include "cldmgr.h" >+#include "fake_platform_defs.h" > > extern size_t pgsz; > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/cldmgr.h xfsdump-3.1.4/common/cldmgr.h >--- xfsdump-3.1.4.orig/common/cldmgr.h 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/common/cldmgr.h 2015-09-21 18:25:34.560862254 -0700 >@@ -18,6 +18,8 @@ > #ifndef CLDMGR_H > #define CLDMGR_H > >+#include <assert.h> >+ > /* cldmgr.[hc] - manages all child threads > */ > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/content_common.h xfsdump-3.1.4/common/content_common.h >--- xfsdump-3.1.4.orig/common/content_common.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/content_common.h 2015-09-21 19:25:18.847104028 -0700 >@@ -18,6 +18,8 @@ > #ifndef CONTENT_COMMON_H > #define CONTENT_COMMON_H > >+#include "fake_platform_defs.h" >+ > extern bool_t Media_prompt_change( drive_t *drivep ); > > #endif /* CONTENT_COMMON_H */ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/dlog.c xfsdump-3.1.4/common/dlog.c >--- xfsdump-3.1.4.orig/common/dlog.c 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/common/dlog.c 2015-09-21 19:12:38.198951191 -0700 >@@ -26,11 +26,15 @@ > #include <time.h> > #include <errno.h> > #include <signal.h> >+#include <assert.h> >+#include <string.h> >+#include <unistd.h> > > #include "types.h" > #include "mlog.h" > #include "dlog.h" > #include "getopt.h" >+#include "fake_platform_defs.h" > > static int dlog_ttyfd = -1; > static volatile bool_t dlog_allowed_flag = BOOL_FALSE; >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/drive.h xfsdump-3.1.4/common/drive.h >--- xfsdump-3.1.4.orig/common/drive.h 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/common/drive.h 2015-09-21 16:14:21.961597614 -0700 >@@ -18,6 +18,10 @@ > #ifndef DRIVE_H > #define DRIVE_H > >+#include <stdlib.h> >+ >+#include "fake_platform_defs.h" >+ > /* drive.[hc] - drive abstraction > * > * drive_t provides a framework for device-independent drive abstraction, >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/fs.c xfsdump-3.1.4/common/fs.c >--- xfsdump-3.1.4.orig/common/fs.c 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/fs.c 2015-09-21 18:59:53.363497015 -0700 >@@ -31,7 +31,7 @@ > #include "types.h" > #include "mlog.h" > #include "fs.h" >- >+#include "fake_platform_defs.h" > > /* fs_info - a magic, highly heuristic function to convert a user-supplied > * string into a file system type, character special device pathname, >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/fs.h xfsdump-3.1.4/common/fs.h >--- xfsdump-3.1.4.orig/common/fs.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/fs.h 2015-09-21 18:31:04.980499764 -0700 >@@ -18,6 +18,11 @@ > #ifndef FS_H > #define FS_H > >+#include <assert.h> >+#include <string.h> >+#include <unistd.h> >+#include <stddef.h> >+ > /* fs - utilities for examining and manipulating file systems > */ > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/global.c xfsdump-3.1.4/common/global.c >--- xfsdump-3.1.4.orig/common/global.c 2012-11-01 21:48:24.000000000 -0700 >+++ xfsdump-3.1.4/common/global.c 2015-09-21 19:48:38.838724334 -0700 >@@ -22,6 +22,7 @@ > #include <sys/stat.h> > #include <time.h> > #include <errno.h> >+#include <unistd.h> > > #include "types.h" > #include "util.h" >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/global.h xfsdump-3.1.4/common/global.h >--- xfsdump-3.1.4.orig/common/global.h 2012-11-01 21:48:24.000000000 -0700 >+++ xfsdump-3.1.4/common/global.h 2015-09-21 18:32:47.472456705 -0700 >@@ -18,6 +18,8 @@ > #ifndef GLOBAL_H > #define GLOBAL_H > >+#include <assert.h> >+ > /* global_hdr_t - first page of every media file > */ > #define GLOBAL_HDR_SZ PGSZ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/hsmapi.h xfsdump-3.1.4/common/hsmapi.h >--- xfsdump-3.1.4.orig/common/hsmapi.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/hsmapi.h 2015-09-21 18:37:32.913551643 -0700 >@@ -21,10 +21,12 @@ > > #include <xfs/xfs.h> > #include <xfs/jdm.h> >+#include <assert.h> > #include "types.h" > #include "global.h" > #include "content.h" > #include "content_inode.h" >+#include "fake_platform_defs.h" > > #define HSM_API_VERSION_1 1 /* only version supported so far */ > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/lock.c xfsdump-3.1.4/common/lock.c >--- xfsdump-3.1.4.orig/common/lock.c 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/lock.c 2015-09-21 18:39:21.690444521 -0700 >@@ -18,6 +18,7 @@ > > #include <xfs/xfs.h> > #include <xfs/jdm.h> >+#include <assert.h> > > #include "types.h" > #include "qlock.h" >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/mlog.h xfsdump-3.1.4/common/mlog.h >--- xfsdump-3.1.4.orig/common/mlog.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/mlog.h 2015-09-21 19:16:30.003564009 -0700 >@@ -21,7 +21,9 @@ > /* mlog.[hc] - message logging abstraction > */ > #include <stdarg.h> >+#include <string.h> > #include "types.h" >+#include "fake_platform_defs.h" > > /* defined log levels - msg will be logged only if cmdline -v arg > * is greater than or equal to its level. >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/path.h xfsdump-3.1.4/common/path.h >--- xfsdump-3.1.4.orig/common/path.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/common/path.h 2015-09-21 19:18:45.134170643 -0700 >@@ -18,6 +18,10 @@ > #ifndef PATH_H > #define PATH_H > >+#include <string.h> >+#include <assert.h> >+#include "fake_platform_defs.h" >+ > /* various pathname helpers > */ > extern char * path_reltoabs( char *dir, char *basedir ); >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/ring.h xfsdump-3.1.4/common/ring.h >--- xfsdump-3.1.4.orig/common/ring.h 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/common/ring.h 2015-09-21 19:19:39.713607506 -0700 >@@ -18,6 +18,8 @@ > #ifndef RING_H > #define RING_H > >+#include "fake_platform_defs.h" >+ > /* ring - readahead/writeahead abstraction > * > * the ring is conceptually an ordered set of messages circulating between the >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/common/util.h xfsdump-3.1.4/common/util.h >--- xfsdump-3.1.4.orig/common/util.h 2014-07-17 15:02:07.000000000 -0700 >+++ xfsdump-3.1.4/common/util.h 2015-09-21 18:39:47.773179050 -0700 >@@ -18,6 +18,8 @@ > #ifndef UTIL_H > #define UTIL_H > >+#include <string.h> >+#include "fake_platform_defs.h" > > /* util.[hc] - generally useful functions > */ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/configure.ac xfsdump-3.1.4/configure.ac >--- xfsdump-3.1.4.orig/configure.ac 2014-02-04 19:08:30.000000000 -0800 >+++ xfsdump-3.1.4/configure.ac 2015-09-21 19:57:47.572060564 -0700 >@@ -1,9 +1,10 @@ >-AC_INIT([xfsdump], [3.1.3]) >+AC_INIT([xfsdump], [3.1.4]) > AC_PREREQ(2.50) > AC_CONFIG_AUX_DIR([.]) > AC_CONFIG_MACRO_DIR([m4]) > AC_CONFIG_SRCDIR([common/main.c]) > AC_CONFIG_HEADER(include/config.h) >+AC_CONFIG_HEADER([include/fake_platform_defs.h]) > AC_PREFIX_DEFAULT(/usr) > > AC_PROG_LIBTOOL >@@ -54,9 +55,12 @@ esac > AC_SUBST([root_sbindir]) > AC_SUBST([root_libdir]) > >-# Find localized files >+# Find localized files. Don't descend into any "dot directories" >+# (like .git or .pc from quilt). Strangely, the "-print" argument >+# to "find" is required, to avoid including such directories in the >+# list. > LOCALIZED_FILES="" >-for lfile in `find ${srcdir} -name '*.c' -type f || exit 1`; do >+for lfile in `find ${srcdir} -path './.??*' -prune -o -name '*.c' -type f -print || exit 1`; do > LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile" > done > AC_SUBST(LOCALIZED_FILES) >@@ -82,6 +86,12 @@ AC_PACKAGE_NEED_ATTRIBUTES_H > AC_PACKAGE_NEED_ATTRIBUTES_MACROS > AC_PACKAGE_NEED_ATTRGET_LIBATTR > >+AC_CHECK_SIZEOF([long]) >+AC_CHECK_SIZEOF([char *]) >+AC_TYPE_PSINT >+AC_TYPE_PSUNSIGNED >+AC_TYPE_U32 >+AC_TYPE_UMODE_T > AC_MANUAL_FORMAT > > AC_CONFIG_FILES([include/builddefs]) >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/dump/var.c xfsdump-3.1.4/dump/var.c >--- xfsdump-3.1.4.orig/dump/var.c 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/dump/var.c 2015-09-21 19:00:14.144261369 -0700 >@@ -29,6 +29,7 @@ > #include "mlog.h" > #include "global.h" > #include "inventory.h" >+#include "fake_platform_defs.h" > > static void var_skip_recurse( char *, void ( * )( xfs_ino_t )); > static int var_create_component( char * ); >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/include/builddefs.in xfsdump-3.1.4/include/builddefs.in >--- xfsdump-3.1.4.orig/include/builddefs.in 2012-11-01 21:48:24.000000000 -0700 >+++ xfsdump-3.1.4/include/builddefs.in 2015-09-21 18:48:56.391594840 -0700 >@@ -75,6 +75,9 @@ GCCFLAGS = -funsigned-char -fno-strict-a > > ifeq ($(PKG_PLATFORM),linux) > PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS) >+ifeq ($(HAVE_UMODE_T),yes) >+PCFLAGS += -DHAVE_UMODE_T >+endif > DEPENDFLAGS = -D__linux__ > endif > ifeq ($(PKG_PLATFORM),darwin) >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/include/config.h.in xfsdump-3.1.4/include/config.h.in >--- xfsdump-3.1.4.orig/include/config.h.in 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/include/config.h.in 2015-09-21 16:22:40.000000000 -0700 >@@ -1,24 +1,107 @@ >-/* >- * Copyright (c) 2002 Silicon Graphics, Inc. All Rights Reserved. >- * >- * @configure_input@ >- */ >-#ifndef __CONFIG_H__ >-#define __CONFIG_H__ >- >-/* Define if you want gettext (I18N) support */ >-#undef ENABLE_GETTEXT >- >-#ifndef _ >-# ifdef ENABLE_GETTEXT >-# include <libintl.h> >-# define _(x) gettext(x) >-# else >-# define _(x) (x) >-# define textdomain(d) do { } while (0) >-# define bindtextdomain(d,dir) do { } while (0) >-# endif >-#endif >-#include <locale.h> >+/* include/config.h.in. Generated from configure.ac by autoheader. */ > >-#endif /* __CONFIG_H__ */ >+/* Define to 1 if you have the <attr/attributes.h> header file. */ >+#undef HAVE_ATTR_ATTRIBUTES_H >+ >+/* Define to 1 if you have the <dlfcn.h> header file. */ >+#undef HAVE_DLFCN_H >+ >+/* Define to 1 if you have the <inttypes.h> header file. */ >+#undef HAVE_INTTYPES_H >+ >+/* Define to 1 if you have the `attr' library (-lattr). */ >+#undef HAVE_LIBATTR >+ >+/* Define to 1 if you have the `handle' library (-lhandle). */ >+#undef HAVE_LIBHANDLE >+ >+/* Define to 1 if you have the `ncurses' library (-lncurses). */ >+#undef HAVE_LIBNCURSES >+ >+/* Define to 1 if you have the `pthread' library (-lpthread). */ >+#undef HAVE_LIBPTHREAD >+ >+/* Define to 1 if you have the `uuid' library (-luuid). */ >+#undef HAVE_LIBUUID >+ >+/* Define to 1 if you have the <memory.h> header file. */ >+#undef HAVE_MEMORY_H >+ >+/* Define to 1 if you have the <ncurses.h> header file. */ >+#undef HAVE_NCURSES_H >+ >+/* Define to 1 if you have the <pthread.h> header file. */ >+#undef HAVE_PTHREAD_H >+ >+/* Define to 1 if you have the <stdint.h> header file. */ >+#undef HAVE_STDINT_H >+ >+/* Define to 1 if you have the <stdlib.h> header file. */ >+#undef HAVE_STDLIB_H >+ >+/* Define to 1 if you have the <strings.h> header file. */ >+#undef HAVE_STRINGS_H >+ >+/* Define to 1 if you have the <string.h> header file. */ >+#undef HAVE_STRING_H >+ >+/* Define to 1 if you have the <sys/attributes.h> header file. */ >+#undef HAVE_SYS_ATTRIBUTES_H >+ >+/* Define to 1 if you have the <sys/stat.h> header file. */ >+#undef HAVE_SYS_STAT_H >+ >+/* Define to 1 if you have the <sys/types.h> header file. */ >+#undef HAVE_SYS_TYPES_H >+ >+/* Define to 1 if you have the <sys/uuid.h> header file. */ >+#undef HAVE_SYS_UUID_H >+ >+/* Define to 1 if you have the <unistd.h> header file. */ >+#undef HAVE_UNISTD_H >+ >+/* Define to 1 if you have the `uuid_compare' function. */ >+#undef HAVE_UUID_COMPARE >+ >+/* Define to 1 if you have the <uuid.h> header file. */ >+#undef HAVE_UUID_H >+ >+/* Define to 1 if you have the <uuid/uuid.h> header file. */ >+#undef HAVE_UUID_UUID_H >+ >+/* Define to 1 if you have the <xfs/handle.h> header file. */ >+#undef HAVE_XFS_HANDLE_H >+ >+/* Define to 1 if you have the <xfs/xfs.h> header file. */ >+#undef HAVE_XFS_XFS_H >+ >+/* Define to the sub-directory in which libtool stores uninstalled libraries. >+ */ >+#undef LT_OBJDIR >+ >+/* Define to the address where bug reports for this package should be sent. */ >+#undef PACKAGE_BUGREPORT >+ >+/* Define to the full name of this package. */ >+#undef PACKAGE_NAME >+ >+/* Define to the full name and version of this package. */ >+#undef PACKAGE_STRING >+ >+/* Define to the one symbol short name of this package. */ >+#undef PACKAGE_TARNAME >+ >+/* Define to the home page for this package. */ >+#undef PACKAGE_URL >+ >+/* Define to the version of this package. */ >+#undef PACKAGE_VERSION >+ >+/* The size of `char *', as computed by sizeof. */ >+#undef SIZEOF_CHAR_P >+ >+/* The size of `long', as computed by sizeof. */ >+#undef SIZEOF_LONG >+ >+/* Define to 1 if you have the ANSI C header files. */ >+#undef STDC_HEADERS >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/include/fake_platform_defs.h.in xfsdump-3.1.4/include/fake_platform_defs.h.in >--- xfsdump-3.1.4.orig/include/fake_platform_defs.h.in 1969-12-31 16:00:00.000000000 -0800 >+++ xfsdump-3.1.4/include/fake_platform_defs.h.in 2015-09-21 19:27:28.417763566 -0700 >@@ -0,0 +1,163 @@ >+/* >+ * Copyright (c) 2000-2015 Silicon Graphics, Inc. >+ * All Rights Reserved. >+ * >+ * This program is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Lesser General Public License >+ * as published by the Free Software Foundation. >+ * >+ * This program is distributed in the hope that it would be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+ * GNU Lesser General Public License for more details. >+ * >+ * You should have received a copy of the GNU Lesser General Public License >+ * along with this program; if not, write the Free Software Foundation, >+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA >+ * >+ * @configure_input@ >+ */ >+#ifndef _FAKE_PLATFORM_DEFS_H >+#define _FAKE_PLATFORM_DEFS_H >+ >+#include <stdio.h> >+#include <errno.h> >+#include <fcntl.h> >+#include <stdarg.h> >+#include <assert.h> >+#include <stddef.h> >+#include <stdlib.h> >+#include <string.h> >+#include <stdint.h> >+#include <unistd.h> >+#include <pthread.h> >+#include <ctype.h> >+#include <sys/types.h> >+#include <limits.h> >+#include <stdbool.h> >+ >+#undef HAVE___U32 >+#ifdef HAVE___U32 >+#include <asm/types.h> >+#else >+typedef unsigned char __u8; >+typedef signed char __s8; >+typedef unsigned short __u16; >+typedef signed short __s16; >+typedef unsigned int __u32; >+typedef signed int __s32; >+typedef unsigned long long int __u64; >+typedef signed long long int __s64; >+#endif >+ >+#ifdef __CHECKER__ >+#define __bitwise __attribute__((bitwise)) >+#define __force __attribute__((force)) >+#else >+#define __bitwise >+#define __force >+#endif >+ >+typedef __u16 __bitwise __le16; >+typedef __u32 __bitwise __le32; >+typedef __u64 __bitwise __le64; >+ >+typedef __u16 __bitwise __be16; >+typedef __u32 __bitwise __be32; >+typedef __u64 __bitwise __be64; >+ >+typedef struct filldir filldir_t; >+ >+#if defined(__linux__) >+#include <xfs/linux.h> >+#elif defined(__FreeBSD__) >+#include <xfs/freebsd.h> >+#elif defined(__FreeBSD_kernel__) >+#include <xfs/gnukfreebsd.h> >+#elif defined(__APPLE__) >+#include <xfs/darwin.h> >+#elif defined(__sgi__) || defined(__sgi) >+#include <xfs/irix.h> >+#else >+# error unknown platform... have fun porting! >+#endif >+ >+/* long and pointer must be either 32 bit or 64 bit */ >+#undef SIZEOF_LONG >+#undef SIZEOF_CHAR_P >+#define BITS_PER_LONG (SIZEOF_LONG * CHAR_BIT) >+ >+/* Check if __psint_t is set to something meaningful */ >+#undef HAVE___PSINT_T >+#ifndef HAVE___PSINT_T >+# if (SIZEOF_CHAR_P * CHAR_BIT) == 32 >+typedef int __psint_t; >+# elif (SIZEOF_CHAR_P * CHAR_BIT) == 64 >+# if BITS_PER_LONG == 64 >+typedef long __psint_t; >+# else >+/* This is a very strange architecture, which has 64 bit pointers but */ >+/* not 64 bit longs. So, just punt here and assume long long is OK. */ >+typedef long long __psint_t; >+# endif >+# else >+# error Unknown pointer size >+# endif >+#endif >+ >+/* Check whether to define umode_t ourselves. */ >+#ifndef HAVE_UMODE_T >+typedef unsigned short umode_t; >+#endif >+ >+/* Define if you want gettext (I18N) support */ >+#undef ENABLE_GETTEXT >+#ifdef ENABLE_GETTEXT >+# include <libintl.h> >+# define _(x) gettext(x) >+# define N_(x) x >+#else >+# define _(x) (x) >+# define N_(x) x >+# define textdomain(d) do { } while (0) >+# define bindtextdomain(d,dir) do { } while (0) >+#endif >+#include <locale.h> >+ >+#ifdef DEBUG >+# define ASSERT(EX) assert(EX) >+#else >+# define ASSERT(EX) ((void) 0) >+#endif >+ >+/* >+ * sparse kernel source annotations >+ */ >+#ifndef __user >+#define __user >+#endif >+ >+#define IRIX_DEV_BITSMAJOR 14 >+#define IRIX_DEV_BITSMINOR 18 >+#define IRIX_DEV_MAXMAJ 0x1ff >+#define IRIX_DEV_MAXMIN 0x3ffff >+#define IRIX_DEV_MAJOR(dev) ((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \ >+ & IRIX_DEV_MAXMAJ)) >+#define IRIX_DEV_MINOR(dev) ((int)((dev) & IRIX_DEV_MAXMIN)) >+#define IRIX_MKDEV(major,minor) ((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \ >+ | (minor&IRIX_DEV_MAXMIN))) >+#define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev)) >+ >+/* ARM old ABI has some weird alignment/padding */ >+#if defined(__arm__) && !defined(__ARM_EABI__) >+#define __arch_pack __attribute__((packed)) >+#else >+#define __arch_pack >+#endif >+ >+#ifndef min >+#define min(a,b) (((a)<(b))?(a):(b)) >+#define max(a,b) (((a)>(b))?(a):(b)) >+#endif >+ >+#endif /* !defined(_FAKE_PLATFORM_DEFS_H) */ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/include/Makefile xfsdump-3.1.4/include/Makefile >--- xfsdump-3.1.4.orig/include/Makefile 2010-03-31 00:47:34.000000000 -0700 >+++ xfsdump-3.1.4/include/Makefile 2015-09-21 17:00:29.253153014 -0700 >@@ -6,7 +6,7 @@ TOPDIR = .. > include $(TOPDIR)/include/builddefs > > HFILES = swab.h swap.h >-LSRCFILES = builddefs.in buildmacros buildrules config.h.in install-sh >+LSRCFILES = fake_platform_defs.h.in builddefs.in buildmacros buildrules config.h.in install-sh > > default install install-dev : > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/inventory/inv_files.c xfsdump-3.1.4/inventory/inv_files.c >--- xfsdump-3.1.4.orig/inventory/inv_files.c 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/inventory/inv_files.c 2015-09-21 18:41:20.944230736 -0700 >@@ -23,7 +23,8 @@ > #include <errno.h> > #include <sys/stat.h> > #include <sys/dir.h> >- >+#include <assert.h> >+#include "fake_platform_defs.h" > > /*----------------------------------------------------------------------*/ > /* */ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/inventory/inv_idx.c xfsdump-3.1.4/inventory/inv_idx.c >--- xfsdump-3.1.4.orig/inventory/inv_idx.c 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/inventory/inv_idx.c 2015-09-21 17:06:20.246527192 -0700 >@@ -25,6 +25,7 @@ > #include <sys/file.h> > #include <sys/stat.h> > #include <sys/dir.h> >+#include <string.h> > #include "types.h" > #include "mlog.h" > #include "inv_priv.h" >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/inventory/inv_priv.h xfsdump-3.1.4/inventory/inv_priv.h >--- xfsdump-3.1.4.orig/inventory/inv_priv.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/inventory/inv_priv.h 2015-09-21 18:48:13.025036277 -0700 >@@ -19,9 +19,12 @@ > #define _INV_PRIV_H_ > > #include <sys/file.h> /* for flock */ >+#include <string.h> >+#include <assert.h> > #include "global.h" > #include "inventory.h" > #include "mlog.h" >+#include "fake_platform_defs.h" > > > /*----------------------------------------------------------------------*/ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/invutil/cmenu.h xfsdump-3.1.4/invutil/cmenu.h >--- xfsdump-3.1.4.orig/invutil/cmenu.h 2010-03-31 00:47:34.000000000 -0700 >+++ xfsdump-3.1.4/invutil/cmenu.h 2015-09-21 18:33:39.677925402 -0700 >@@ -18,6 +18,8 @@ > #ifndef CMENU_H > #define CMENU_H > >+#include <string.h> >+ > #include "types.h" > #include "mlog.h" > #include "inv_priv.h" >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/invutil/invutil.c xfsdump-3.1.4/invutil/invutil.c >--- xfsdump-3.1.4.orig/invutil/invutil.c 2011-07-16 18:35:03.000000000 -0700 >+++ xfsdump-3.1.4/invutil/invutil.c 2015-09-21 18:23:37.520053240 -0700 >@@ -24,6 +24,7 @@ > #include <fcntl.h> > #include <time.h> > #include <sys/mman.h> >+#include <string.h> > > #include "types.h" > #include "mlog.h" >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/invutil/invutil.h xfsdump-3.1.4/invutil/invutil.h >--- xfsdump-3.1.4.orig/invutil/invutil.h 2011-07-16 18:35:03.000000000 -0700 >+++ xfsdump-3.1.4/invutil/invutil.h 2015-09-21 18:21:05.561599484 -0700 >@@ -18,6 +18,15 @@ > #ifndef INVUTIL_H > #define INVUTIL_H > >+#include <stdlib.h> >+#include <string.h> >+#include <unistd.h> >+#include <sys/types.h> >+#include <assert.h> >+ >+#include "types.h" >+#include "inv_priv.h" >+ > #define STR_LEN INV_STRLEN+32 > #define GEN_STRLEN 32 > >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/librmt/rmtlib.h xfsdump-3.1.4/librmt/rmtlib.h >--- xfsdump-3.1.4.orig/librmt/rmtlib.h 2010-01-13 15:43:55.000000000 -0800 >+++ xfsdump-3.1.4/librmt/rmtlib.h 2015-09-21 19:00:43.074933436 -0700 >@@ -29,6 +29,13 @@ > > > #include <xfs/xfs.h> >+#include <stdarg.h> >+#include <assert.h> >+#include <string.h> >+#include <stropts.h> >+#include <stdlib.h> >+#include <unistd.h> >+#include "fake_platform_defs.h" > > /* > * Note that local vs remote file descriptors are distinquished >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/m4/Makefile xfsdump-3.1.4/m4/Makefile >--- xfsdump-3.1.4.orig/m4/Makefile 2012-10-09 13:42:33.000000000 -0700 >+++ xfsdump-3.1.4/m4/Makefile 2015-09-21 17:40:55.204058654 -0700 >@@ -18,6 +18,7 @@ LSRCFILES = \ > package_globals.m4 \ > package_ncurses.m4 \ > package_pthread.m4 \ >+ package_types.m4 \ > package_utilies.m4 \ > package_uuiddev.m4 \ > package_xfslibs.m4 \ >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/m4/package_types.m4 xfsdump-3.1.4/m4/package_types.m4 >--- xfsdump-3.1.4.orig/m4/package_types.m4 1969-12-31 16:00:00.000000000 -0800 >+++ xfsdump-3.1.4/m4/package_types.m4 2015-09-21 16:23:40.671925517 -0700 >@@ -0,0 +1,52 @@ >+# >+# Check if we have a type for the pointer's size integer (__psint_t) >+# >+AC_DEFUN([AC_TYPE_PSINT], >+ [ AC_MSG_CHECKING([for __psint_t ]) >+ AC_TRY_COMPILE([ >+#include <sys/types.h> >+#include <stdlib.h> >+#include <stddef.h> >+ ], [ >+ __psint_t psint; >+ ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) >+ ]) >+ >+# >+# Check if we have a type for the pointer's size unsigned (__psunsigned_t) >+# >+AC_DEFUN([AC_TYPE_PSUNSIGNED], >+ [ AC_MSG_CHECKING([for __psunsigned_t ]) >+ AC_TRY_COMPILE([ >+#include <sys/types.h> >+#include <stdlib.h> >+#include <stddef.h> >+ ], [ >+ __psunsigned_t psuint; >+ ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) >+ ]) >+ >+# >+# Check if we have a type for __u32 >+# >+AC_DEFUN([AC_TYPE_U32], >+ [ AC_MSG_CHECKING([for __u32 ]) >+ AC_TRY_COMPILE([ >+#include <asm/types.h> >+#include <stdlib.h> >+#include <stddef.h> >+ ], [ >+ __u32 u32; >+ ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) >+ ]) >+# >+# Check if we have umode_t >+# >+AC_DEFUN([AC_TYPE_UMODE_T], >+ [ AC_MSG_CHECKING([for umode_t]) >+ AC_TRY_COMPILE([ >+#include <asm/types.h> >+ ], [ >+ umode_t umode; >+ ], AC_DEFINE(HAVE_UMODE_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) >+ ]) >diff -urpN -x install-sh -x aclocal.m4 -x config.guess -x config.log -x config.status -x config.sub -x configure -x Changes.gz -x .gitcensus -x ltmain.sh -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltoptions.m4 -x libtool.m4 -x fake_platform_defs.h xfsdump-3.1.4.orig/Makefile xfsdump-3.1.4/Makefile >--- xfsdump-3.1.4.orig/Makefile 2013-04-30 22:37:29.000000000 -0700 >+++ xfsdump-3.1.4/Makefile 2015-09-21 17:14:30.849445807 -0700 >@@ -34,7 +34,8 @@ SRCTARINC = m4/libtool.m4 m4/lt~obsolete > > LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \ > conftest* built .census install.* install-dev.* *.gz \ >- autom4te.cache/* libtool include/builddefs include/config.h >+ autom4te.cache/* libtool include/builddefs include/config.h \ >+ include/fake_platform_defs.h > > ifeq ($(HAVE_BUILDDEFS), yes) > LDIRDIRT = $(SRCDIR)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=412966">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 560358
:
411806
|
412956
|
412964
| 412966 |
412968
