commit 8b925c6ccd3968917253ea191906a1710c40ed2d from: Thomas Adam date: Sat Jul 16 17:56:14 2022 UTC portable: add back sys/queue.h Now that the handling of including sys/queue.h is better, there's no need to remove those lines from the source. Copy the location of those original sys/queue.h lines from upstream at the same line number, so as to avoid any conflicts in the future. commit - 6aa6ad446ad8a9d9dca3928bca5d0ea33a138e42 commit + 8b925c6ccd3968917253ea191906a1710c40ed2d blob - e5e63b466b8040e49029c5424d9f0f62f49832b3 blob + 034dde68216bb0a706cedd6e96ebac3012ccb8ab --- got/got.c +++ got/got.c @@ -16,6 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include blob - 67c42d41819d891117256e71fc6e7b79f1223d64 blob + 4f38eb90d521bbfaf30230deff6a2ca10397d052 --- gotadmin/gotadmin.c +++ gotadmin/gotadmin.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - feec197969b967cd710d19c6983a00452985db87 blob + da9f041cbfef9184c60aa257ec187e714ee04860 --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 9ae9b6d5b2c163cd71dd4d6c284eeb75e027fb1a blob + 6676eb0a0649ddeb36686b874f1c193eb6fead0a --- gotweb/parse.y +++ gotweb/parse.y @@ -23,6 +23,7 @@ %{ #include #include +#include #include #include blob - 5a76b94aca16e49a18882ea8ab6ac4d9dfcd7f48 blob + e8f256ef8ff4f5e92a6bc9bc0615d33b1b05140b --- gotwebd/config.c +++ gotwebd/config.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include blob - 9e68f4027f2f8406d2668b558f5c35423ddd20de blob + c7317172f7c1dd0eb9f2595f4a4d0f9976784174 --- gotwebd/fcgi.c +++ gotwebd/fcgi.c @@ -17,6 +17,7 @@ */ #include +#include #include #include blob - 544fd9c7168f4e8dd30337249821101db7696763 blob + 5bc830293ba12e23a7db3496d2dab9e0ab9805c0 --- gotwebd/got_operations.c +++ gotwebd/got_operations.c @@ -16,6 +16,7 @@ */ #include +#include #include #include blob - 49094f4539435c3d8f70a8497697d56329c8e348 blob + 8c77b4c967b0988350d2bba2fe460bcf97b15dac --- gotwebd/gotweb.c +++ gotwebd/gotweb.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include blob - 56cc78f8ef8d5f658fc9176ef43485f72507a60b blob + 87a3096efd622c30cca639fa880db29b0fcd8c8c --- gotwebd/gotwebd.c +++ gotwebd/gotwebd.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include blob - dc7c84efaf6ec6c1ee3babbaf8c49795d4e21dd6 blob + 452dca656643a296210cdb64d5b1504c43807d88 --- gotwebd/gotwebd.h +++ gotwebd/gotwebd.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include blob - e0f5d42528be2b7a639fc358596b40be313ec957 blob + 1f6c99727d2651417486997179bd6c788573e6ca --- gotwebd/parse.y +++ gotwebd/parse.y @@ -23,6 +23,7 @@ %{ #include #include +#include #include #include blob - bf05c95cc470b3255a2f1af3d6d5720b4a027592 blob + 0ec6a27f7f19f04fc2dcb6a9c0eb2a7ba9d73f81 --- gotwebd/proc.c +++ gotwebd/proc.c @@ -16,6 +16,7 @@ */ #include +#include #include #include blob - 17c763b271f67a8fec0c5e7c801f8c3c875d4ae2 blob + 84fdc92c35b07e32c8a20a6428aa69c315f79f4c --- gotwebd/sockets.c +++ gotwebd/sockets.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include blob - b370c20f031f2ce22960b55934abc3655eb004f5 blob + 9ad6d532d61bbc59e1272cc8ffae2bb8bbdede9b --- lib/blame.c +++ lib/blame.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 419ff68d2f102e11ebd0fadf20e476be665a59e7 blob + 1c914ee420f9d1fd24cc811a67c7c81a690b9d2a --- lib/buf.c +++ lib/buf.c @@ -24,6 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include blob - 1286c9b89a7ba9696c5d6c9a9de0a2f40bf29cd7 blob + 5fb4e1e85c7a74b5eb7ad59732f75f45ac841f7a --- lib/commit_graph.c +++ lib/commit_graph.c @@ -16,6 +16,7 @@ #include #include +#include #include #include blob - 1c89bfa953de956bb2865877c48a43e95df37e3b blob + 78e15eecc67f73ec094e4228879c39a5732e1d87 --- lib/deflate.c +++ lib/deflate.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - a19a21be699a9382d152a7d628d82068ead2d78c blob + 618841b580474c8ab1894240045e221759e59487 --- lib/delta.c +++ lib/delta.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - eacc404c3d5931a6cc8d2c00dcb03d455204a92d blob + 8d91765140a3e4de9b04a71ccf678e92cfd57abc --- lib/delta_cache.c +++ lib/delta_cache.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 8e0ee99afbf570359d1e6fe64ef634260f6b54d7 blob + d30a598fe4e93888af0b6bf95e0deb862e3ca037 --- lib/deltify.c +++ lib/deltify.c @@ -16,6 +16,7 @@ */ #include +#include #include #include blob - 73d6e90e84e9a1c3190d740b2a5f86409b553e8f blob + 5ee9ba9d4e2a3d8a9e9503e1295b3587bab058ae --- lib/dial.c +++ lib/dial.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include blob - 2c0003628005affec2c6c01dd6b883d3f62ec78b blob + 14734de52bef2db3787421c6d6fb25df85a94361 --- lib/diff.c +++ lib/diff.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - f6349f0da20ae886ce5955cde2f1d105da19d70f blob + ec70e57bff6e373352417678b49cb40fc0431e6c --- lib/diff3.c +++ lib/diff3.c @@ -65,6 +65,7 @@ */ #include +#include #include #include blob - e84f689c1bd00b38b2adcb0b972599dba7eec582 blob + 7b585c9148badc2c5ae6935a278d6ce4bcf8a5d0 --- lib/diff_main.c +++ lib/diff_main.c @@ -16,6 +16,7 @@ */ +#include #include #include #include blob - 15eab164889e28d41b53f3acdec695aac8393073 blob + f50562ea7c4eab62df85e0099e0b4de267333c5b --- lib/diffreg.c +++ lib/diffreg.c @@ -17,6 +17,7 @@ #include #include +#include #include #include blob - 7be87fb981fd9501f03be122b01840603bf5b379 blob + 0b6349576da098cee9d587d219ed6b029456d568 --- lib/error.c +++ lib/error.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - a6f40357af86725163aaec0415fa2792e366fd8d blob + 471ae3a865feeef0f562632eb264f4e49cce2dae --- lib/fetch.c +++ lib/fetch.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include blob - efa4991b9e207e7ed8f7a422e5c83f5cd79b69b4 blob + 3e29956ae33fe8c3411cc0f607d762679e49d571 --- lib/fileindex.c +++ lib/fileindex.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 79337138861c4aa917c6cbb1552a0743dde3a958 blob + 9cee3eb3d8e8579efbc1af3b1c3a92cac95e4a9f --- lib/gitconfig.c +++ lib/gitconfig.c @@ -27,6 +27,7 @@ */ #include +#include #include #include blob - 3b96469ab708761260c2a3efdf268310989076bd blob + dec248671df1f10f622bd433e33a46fc2d10f627 --- lib/gitproto.c +++ lib/gitproto.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 15c59da31d1d53d2ceac7f3f8184fb211f1f8403 blob + f4b8945c99801ba8be0d56637b26e91ea722d2d5 --- lib/gotconfig.c +++ lib/gotconfig.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - ffefe8d4e6ed7e2b338aa97ea44f95f7faee3434 blob + 401bb162fea4063ab606d8427b8d6908aa94ce93 --- lib/inflate.c +++ lib/inflate.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 2d85d99def0e84249e38b3f4724dd5e35e1a18a9 blob + e1a1870147bfefcb7e3caaaedf16d6b92e78a5c1 --- lib/lockfile.c +++ lib/lockfile.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 5e8c243b81bbd64d84a68281c291de37f47289c6 blob + 2a520b7792465ad27ff73f8f2cf3b88ec2274d9f --- lib/object.c +++ lib/object.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include blob - 90121b5eb76e85d855091c03ad5c7b2e3b37054e blob + 4e4e2777b1dbdc01db5204cfc9bf11cf2dde7418 --- lib/object_cache.c +++ lib/object_cache.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 3f24aeba16243df7a5bc588249aae2f2551ba93a blob + 5009ce41f8cd313d0ee2a6bba7d4a74c6fea58e8 --- lib/object_create.c +++ lib/object_create.c @@ -16,6 +16,7 @@ #include #include +#include #include #include blob - 57113aae6a5722c03a19dde3bfc3cbafb3541629 blob + a99a2cd31590e898057c912de186ce8b4015810a --- lib/object_idset.c +++ lib/object_idset.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include blob - acf12c8aa14a5b8e63b2234ec1102f3e0bc578a2 blob + 8d08d6deffb8178a2c7cdf10be2b31a05a990a49 --- lib/object_parse.c +++ lib/object_parse.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include blob - 054ae905f1c60527376ced496a88d48170382727 blob + 44ff153b0f81aba53b17181132ab84069f3c5507 --- lib/pack.c +++ lib/pack.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include blob - 5112bbf68d2355a2ad3c74d4028bace917cc3136 blob + f7d23f876f92b546a95aaf832e5265e12021f2cd --- lib/pack_create.c +++ lib/pack_create.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include blob - d319c0e84ab629196caf5ef768c81856c9626e77 blob + c6dfc285c84c6ac028b7f49f4ad9244a52f39e71 --- lib/patch.c +++ lib/patch.c @@ -21,6 +21,7 @@ */ #include +#include #include #include #include blob - 91e2238d72a1db8caed92af293dbe6909e84d4eb blob + 1617ced887ec4ac9d33c92a536325e8c06a1db2e --- lib/path.c +++ lib/path.c @@ -16,6 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 5680c43cfad2cffa827820a54963eeab9c76262e blob + ed19d38df5d90fa8898c52f92b995a6d3f62848b --- lib/privsep.c +++ lib/privsep.c @@ -16,6 +16,7 @@ */ #include +#include #include #include blob - 0697c0943c5bd5da8853f278f78f700caa4175df blob + b54420045df7fc7c13d9719124ecfc64ccda01ef --- lib/rcsutil.c +++ lib/rcsutil.c @@ -27,6 +27,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include blob - 01e0b4c5dacf2ce7ab96d2acbe62a77fc849d931 blob + 15007ad091c5bbeac874d3a7f095826bb21f3867 --- lib/reference.c +++ lib/reference.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - c74aa7e7d04e9758277ada938a43267b428ac1dc blob + 03f07f0502bcb5b56cfa17c892cce593e261e917 --- lib/repository.c +++ lib/repository.c @@ -15,6 +15,7 @@ */ #include +#include #include #include #include blob - 0e2bccb727dfe8aab48409a7252bb34bf8879176 blob + 3401d89b5c7cf573b1e8c833a36631823c69c419 --- lib/repository_admin.c +++ lib/repository_admin.c @@ -15,6 +15,7 @@ */ #include +#include #include #include #include blob - bc8aac751053248ee59f0c1b5be70ae57b6e97f1 blob + 8052da70da209c46c261cb11f1e58ce7bb95403a --- lib/send.c +++ lib/send.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include blob - 4af447359ea258795b19a825ab5b6245b33d9409 blob + bd881b3a8d3258eb89eb6658259779307c9087d8 --- lib/sigs.c +++ lib/sigs.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include blob - c4d0be55d9567f300e422f7ea059ea81744afa7a blob + 553e6bf2e7d7eb1a347e0a5a1542621d2124c6bb --- lib/worktree.c +++ lib/worktree.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - b78a664347abec3aba1876dc39d14cbf3ac57cc4 blob + 7aa2401edb6492104ef2cbd4dfa66633a5c5490b --- lib/worktree_open.c +++ lib/worktree_open.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 1e6bf21a70b5d71aa3b12453c7427e1cad9f6980 blob + 301acad04d464fe444ef5e00ae215324d45534ca --- libexec/got-fetch-pack/got-fetch-pack.c +++ libexec/got-fetch-pack/got-fetch-pack.c @@ -15,6 +15,7 @@ */ #include +#include #include #include #include blob - 69517e0d0138f02236f127c0f31b2113c5a9e1f9 blob + adfe82430669c44becf66e60542e2a069102d0d6 --- libexec/got-index-pack/got-index-pack.c +++ libexec/got-index-pack/got-index-pack.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include blob - 299dfb1ae0a14b4b599bb567807748669f2fe2cc blob + d9566112a5b3e08d6cf30203e0f015242553d858 --- libexec/got-read-blob/got-read-blob.c +++ libexec/got-read-blob/got-read-blob.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 31d32d460579f8928aefb999066e715216e80c1b blob + 4a215fed962b89f5b8b9b4ee8d65ade369db21b6 --- libexec/got-read-commit/got-read-commit.c +++ libexec/got-read-commit/got-read-commit.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - f97c7ff67358e322a048152177e2f9d0b5b81712 blob + ff3627e163f53858ed10cfa6c0860570e49ff420 --- libexec/got-read-gitconfig/got-read-gitconfig.c +++ libexec/got-read-gitconfig/got-read-gitconfig.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - b9052f22d3c1f55bf22de427ccf3adbeb24ef97b blob + 4236ba777f0f997b7f5c92ac68e2480a8f3bf64f --- libexec/got-read-gotconfig/got-read-gotconfig.c +++ libexec/got-read-gotconfig/got-read-gotconfig.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 30138458acdf75220bb9572368ec826118f37f6f blob + 4e401e4d65b837c06a88508dfcbbfee8fb5741ae --- libexec/got-read-gotconfig/parse.y +++ libexec/got-read-gotconfig/parse.y @@ -23,6 +23,7 @@ %{ #include +#include #include blob - 2d058e778766c79c6faacb6f95aba7bc0ffa1b47 blob + b7a22393635d4eed3f7811700a5b8e1f5ebb0c87 --- libexec/got-read-object/got-read-object.c +++ libexec/got-read-object/got-read-object.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 239beb16f967c0f47840d88a76fe11af6549cdcb blob + 030ab7bc796262b8731da91f043600439994888b --- libexec/got-read-pack/got-read-pack.c +++ libexec/got-read-pack/got-read-pack.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include blob - 6e060722d52bf435497a80ec376c1496c81a2647 blob + 35166a4635c2ff0fb604cc64b1b8df2669a70358 --- libexec/got-read-patch/got-read-patch.c +++ libexec/got-read-patch/got-read-patch.c @@ -36,6 +36,7 @@ */ #include +#include #include #include blob - 83d70fe7b21329db35df0e8293775ac32eefeb90 blob + 576363a0e688ddf81965da2cfde756157f0fc80b --- libexec/got-read-tag/got-read-tag.c +++ libexec/got-read-tag/got-read-tag.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - d83b9c856cc4d9c93e359dfd5a23171099a23b73 blob + 25c2f2bc4b6753de4a44414334391ac4c7ab1716 --- libexec/got-read-tree/got-read-tree.c +++ libexec/got-read-tree/got-read-tree.c @@ -15,6 +15,7 @@ */ #include +#include #include #include blob - 128d46236a43f93321fb66a86cb2e648d82eb2b4 blob + 5bbac0a0724746a2b3f761ee079860fd541142cb --- libexec/got-send-pack/got-send-pack.c +++ libexec/got-send-pack/got-send-pack.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include blob - 3b6b62d13199064f323556a0aa75472aa185daa9 blob + 377ea9cd19e22c07f1348e7110a49defd8cb974d --- regress/delta/delta_test.c +++ regress/delta/delta_test.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 7770cecce2ed2736eb51b50d6e8e7f458321d244 blob + c523b0dab205514541bb504368a704c89c4c7019 --- regress/deltify/deltify_test.c +++ regress/deltify/deltify_test.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include blob - 60e2434696a95fcabec91967fcd34c362ae30aad blob + 574f90d5b7226ba1d5c679b136ee47425586461b --- regress/fetch/fetch_test.c +++ regress/fetch/fetch_test.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 0bed4066576cbb226b23d43fc5c6d18a1e16a9e9 blob + 9be3e68e44c62f40e54df5c09dba9aeec90918cf --- regress/idset/idset_test.c +++ regress/idset/idset_test.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - 3381d631df8b38fed1f956c7c9292b22021abddb blob + bbf71a79eb4fa68027df6f06b7a1d9926000a518 --- regress/path/path_test.c +++ regress/path/path_test.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include blob - f9df9942511534234f0ee0c080854bea3f5cbbb0 blob + e98304e582f442365952b072a7a6e9ac992af5eb --- tog/tog.c +++ tog/tog.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include