Date: Mon, 23 Oct 2006 20:12:25 +0100 From: Bartosz Fabianowski <freebsd@chillt.de> To: openoffice@freebsd.org Subject: [PATCH] openoffice.org-2.0 fails to compile on 6-STABLE Message-ID: <453D1419.8080009@chillt.de>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040708080308040505020601 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi I have just upgraded from 2.0.3 to 2.0.4 and compilation broke for me on three separate accounts. All three were manifestations of the same error in OO.o's source: The keyword "NULL" is used to denote a null pointer, which is legal in C but not in C++. The number "0" should be used instead. I am surprised that nobody else seems to have run into this. Maybe my gcc is more picky about standards for some reason? Either way, if anybody else encounters this problem, trivial patches that fix it are attached. - Bartosz --------------040708080308040505020601 Content-Type: text/plain; name="patch-binfilter-inc-bf_svx-svdobj.hxx" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="patch-binfilter-inc-bf_svx-svdobj.hxx" LS0tIGJpbmZpbHRlci9pbmMvYmZfc3Z4L3N2ZG9iai5oeHgub3JpZwlNb24gT2N0IDIzIDEz OjQ3OjU1IDIwMDYKKysrIGJpbmZpbHRlci9pbmMvYmZfc3Z4L3N2ZG9iai5oeHgJTW9uIE9j dCAyMyAxMzo0ODowOCAyMDA2CkBAIC0yNjUsNyArMjY1LDcgQEAKIAl7fQogCXZpcnR1YWwg flNkck9ialVzZXJEYXRhKCk7CiAKLQl2aXJ0dWFsIFNkck9ialVzZXJEYXRhKiBDbG9uZShT ZHJPYmplY3QqIHBPYmoxKSBjb25zdCA9IE5VTEw7CisJdmlydHVhbCBTZHJPYmpVc2VyRGF0 YSogQ2xvbmUoU2RyT2JqZWN0KiBwT2JqMSkgY29uc3QgPSAwOwogCVVJTlQzMiAgR2V0SW52 ZW50b3IoKSBjb25zdCB7IHJldHVybiBuSW52ZW50b3I7IH0KIAlVSU5UMTYgIEdldElkKCkg Y29uc3QgeyByZXR1cm4gbklkZW50aWZpZXI7IH0KIAl2aXJ0dWFsIHZvaWQgV3JpdGVEYXRh KFN2U3RyZWFtJiByT3V0KTsK --------------040708080308040505020601 Content-Type: text/plain; name="patch-sc-source-ui-inc-csvcontrol.hxx" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="patch-sc-source-ui-inc-csvcontrol.hxx" LS0tIHNjL3NvdXJjZS91aS9pbmMvY3N2Y29udHJvbC5oeHgub3JpZwlNb24gT2N0IDIzIDE2 OjU2OjI5IDIwMDYKKysrIHNjL3NvdXJjZS91aS9pbmMvY3N2Y29udHJvbC5oeHgJTW9uIE9j dCAyMyAxNjo1Njo0MSAyMDA2CkBAIC00NDQsNyArNDQ0LDcgQEAKIAogcHJvdGVjdGVkOgog ICAgIC8qKiBEZXJpdmVkIGNsYXNzZXMgY3JlYXRlIGEgbmV3IGFjY2Vzc2libGUgb2JqZWN0 IGhlcmUuICovCi0gICAgdmlydHVhbCBTY0FjY2Vzc2libGVDc3ZDb250cm9sKiBJbXBsQ3Jl YXRlQWNjZXNzaWJsZSgpID0gTlVMTDsKKyAgICB2aXJ0dWFsIFNjQWNjZXNzaWJsZUNzdkNv bnRyb2wqIEltcGxDcmVhdGVBY2Nlc3NpYmxlKCkgPSAwOwogfTsKIAogCg== --------------040708080308040505020601 Content-Type: text/plain; name="patch-svx-inc-svdobj.hxx" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="patch-svx-inc-svdobj.hxx" LS0tIHN2eC9pbmMvc3Zkb2JqLmh4eC5vcmlnCU1vbiBPY3QgMjMgMTI6NTY6MzMgMjAwNgor Kysgc3Z4L2luYy9zdmRvYmouaHh4CU1vbiBPY3QgMjMgMTI6NTY6NTAgMjAwNgpAQCAtMzIz LDcgKzMyMyw3IEBACiAJe30KIAl2aXJ0dWFsIH5TZHJPYmpVc2VyRGF0YSgpOwogCi0Jdmly dHVhbCBTZHJPYmpVc2VyRGF0YSogQ2xvbmUoU2RyT2JqZWN0KiBwT2JqMSkgY29uc3QgPSBO VUxMOworCXZpcnR1YWwgU2RyT2JqVXNlckRhdGEqIENsb25lKFNkck9iamVjdCogcE9iajEp IGNvbnN0ID0gMDsKIAlVSU5UMzIgIEdldEludmVudG9yKCkgY29uc3QgeyByZXR1cm4gbklu dmVudG9yOyB9CiAJVUlOVDE2ICBHZXRJZCgpIGNvbnN0IHsgcmV0dXJuIG5JZGVudGlmaWVy OyB9CiAJLy9CRlMwMXZpcnR1YWwgdm9pZCBXcml0ZURhdGEoU3ZTdHJlYW0mIHJPdXQpOwo= --------------040708080308040505020601--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?453D1419.8080009>