Commit Graph

2118 Commits

Author SHA1 Message Date
Brian Behlendorf e23605530a Update #ifndef/#defines 2008-12-17 10:10:32 -08:00
Brian Behlendorf 6d524f2906 Cleanup some of the #ifndef/#defines 2008-12-17 10:06:55 -08:00
Brian Behlendorf 07394c4b64 Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS 2008-12-17 10:04:04 -08:00
Brian Behlendorf 5945ae3161 Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h 2008-12-17 09:43:11 -08:00
Brian Behlendorf 93f5520dbe Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 09:26:05 -08:00
Brian Behlendorf 640c2f8d7e Add missing includes to zfs cmd Makefile.am 2008-12-17 09:22:40 -08:00
Brian Behlendorf ed36f90405 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 17:00:21 -08:00
Brian Behlendorf 1e64eb4c07 Update makefiles for currently working tools 2008-12-16 16:51:23 -08:00
Brian Behlendorf 8ad2f7697a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:38:48 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 1be9b2649d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 16:34:06 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf 3d34904fbb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:22:34 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf e94598b0fd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 16:19:49 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf 1f5373d772 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 15:52:46 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e0a7138ef2 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf a3ea268b72 Add 2 missing headers 2008-12-16 15:20:56 -08:00
Brian Behlendorf 66cf9db3d0 Remove non-existing systeminfo ref 2008-12-16 14:38:52 -08:00
Brian Behlendorf dbd5e397c5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 14:35:20 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf fb3d1c555a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 9439fbdcd3 Add systeminfo 2008-12-16 14:32:03 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 7df95c2f31 Add missing header 2008-12-16 14:22:31 -08:00
Brian Behlendorf f6207ec73a Add missing headers 2008-12-16 14:17:29 -08:00
Brian Behlendorf 9df591c9d3 Add sys/mount.h header 2008-12-16 14:10:43 -08:00
Brian Behlendorf ac3a2f3476 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:31:42 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf e46311c1e0 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf e329093faf Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:22:44 -08:00
Brian Behlendorf 60ad9afc28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf 5af8235e41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf f276d3eebc Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00