Commit Graph

1032 Commits

Author SHA1 Message Date
Brian Behlendorf fafeacb53f Resolve shadow conflict 2008-12-17 13:01:56 -08:00
Brian Behlendorf a1b865abee Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 12:45:51 -08:00
Brian Behlendorf da718dd80a Resolve shadow conflict 2008-12-17 12:42:17 -08:00
Brian Behlendorf e2a977c404 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 12:23:55 -08:00
Brian Behlendorf b23299c7db Fix two prototypes in the right place 2008-12-17 12:20:20 -08:00
Brian Behlendorf 3719c4146d Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 77811f8236 Fix prototype 2008-12-17 11:48:40 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf d4c1e8b600 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-17 10:20:14 -08:00
Brian Behlendorf 087b2876bb Fix NULL should be 0 usage 2008-12-17 10:18:09 -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 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 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 a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -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 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 f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf c6a4bd8a2e Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-12 13:46:33 -08:00
Brian Behlendorf 415d2e4a1e Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-12 13:46:32 -08:00
Brian Behlendorf 49cfe7da4a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-12 13:46:31 -08:00
Brian Behlendorf dfbea5673a Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-12 13:46:30 -08:00
Brian Behlendorf 8ffbf21ee6 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-12 13:46:29 -08:00
Brian Behlendorf e198681a5c Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-12 13:46:29 -08:00
Brian Behlendorf 9d5295298d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-12 13:46:27 -08:00
Brian Behlendorf 0ee2e37b8d Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-12-12 13:46:27 -08:00
Brian Behlendorf 4b741e6dd5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-12 13:46:25 -08:00
Brian Behlendorf 7fd3f6d8b9 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 13:46:25 -08:00
Brian Behlendorf 295cf87bbd Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-12 13:46:24 -08:00
Brian Behlendorf d941b8ec9c Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-12 13:46:23 -08:00
Brian Behlendorf b00eb5c285 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-12 13:46:22 -08:00
Brian Behlendorf bdb0f362c3 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-12 13:46:22 -08:00
Brian Behlendorf 16ad896509 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-12 13:46:20 -08:00
Brian Behlendorf ad4ff5d2f5 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-12 13:46:20 -08:00
Brian Behlendorf 6bd1d4e45c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-12 13:46:19 -08:00
Brian Behlendorf 7c63b600b1 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-12 13:46:18 -08:00
Brian Behlendorf 810db7e0a2 Remove zcommon reference merged in to zpool 2008-12-12 13:41:20 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf c41f16e355 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-11 15:41:47 -08:00
Brian Behlendorf 66b04c1abb Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 15:41:46 -08:00
Brian Behlendorf d35a0f25fe Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 15:41:45 -08:00
Brian Behlendorf bb92f42dba Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-11 15:41:45 -08:00