Commit Graph

2134 Commits

Author SHA1 Message Date
Brian Behlendorf 683f0b1d6c Fix cast 2008-12-22 16:50:44 -08:00
Brian Behlendorf 44f75e4f86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:40:35 -08:00
Brian Behlendorf e8e738e3b9 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:40:34 -08:00
Brian Behlendorf 9f2908cfb5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:40:32 -08:00
Brian Behlendorf 01414a8906 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:40:31 -08:00
Brian Behlendorf f016a8e15f Update patch carried forward from old release 2008-12-22 16:35:36 -08:00
Brian Behlendorf 36c5ea8174 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:30:37 -08:00
Brian Behlendorf 43abce68c5 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:35 -08:00
Brian Behlendorf f5f002d923 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:30:33 -08:00
Brian Behlendorf 153cb8337b Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:30:32 -08:00
Brian Behlendorf 8ab0586445 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:29 -08:00
Brian Behlendorf 6953ccc7fd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 16:30:28 -08:00
Brian Behlendorf a6152094d0 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:30:27 -08:00
Brian Behlendorf dee065ca8d Use pthread versions 2008-12-22 16:26:23 -08:00
Brian Behlendorf 50735743b7 Err undo that 2008-12-22 16:22:28 -08:00
Brian Behlendorf bb128e51e6 Use thread so we can add other goodies beyond simply the pthread base 2008-12-22 16:20:36 -08:00
Brian Behlendorf 6a394806f5 Prototype fixes 2008-12-22 16:18:07 -08:00
Brian Behlendorf 419cff0fd3 Add more more missing headers 2008-12-22 16:02:08 -08:00
Brian Behlendorf d56b3c2440 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf 720f34ffbe Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf 70045f227b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 15:51:13 -08:00
Brian Behlendorf 4c48a5484d Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 15:51:12 -08:00
Brian Behlendorf f58a0bf4ec Remove now unneeded verify 2008-12-22 15:49:13 -08:00
Brian Behlendorf 67a52f2701 Add more missing include paths 2008-12-22 15:48:05 -08:00
Brian Behlendorf 27dd5bca77 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:36:15 -08:00
Brian Behlendorf dfddd3290c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 1f19965f10 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 262c2c49c1 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 15:36:13 -08:00
Brian Behlendorf 088c5451b7 Add missing include 2008-12-22 15:34:18 -08:00
Brian Behlendorf 9b3b373d4f Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99 2008-12-22 15:33:15 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf c7c77e1279 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf 035e4d373e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf c9597f9a4f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 13:51:15 -08:00
Brian Behlendorf 3b93dc4d82 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:14 -08:00
Brian Behlendorf c9357d8ef2 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf 3a953fa870 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf d684390d3a Just fix a bogus return type 2008-12-22 13:49:15 -08:00
Brian Behlendorf 6bed331e59 More compat changes 2008-12-22 13:47:58 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 7403ce6856 Add missing Makefile foo 2008-12-22 11:38:58 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 6b1fc7b8ee Add linker flags 2008-12-22 11:27:30 -08:00
Brian Behlendorf 356e666729 Add linker flags 2008-12-22 11:26:16 -08:00
Brian Behlendorf 9fb38f075b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 11:25:39 -08:00
Brian Behlendorf 24a90ad2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 11:25:38 -08:00
Brian Behlendorf 864a432edd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 11:25:38 -08:00
Brian Behlendorf 34d556babb Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 11:25:37 -08:00
Brian Behlendorf 7c89e6b7d5 Fix prototype 2008-12-22 11:25:28 -08:00