Date: Mon, 5 Aug 2002 19:23:47 +0200 (CEST) From: Martin Blapp <mb@imp.ch> To: Alexander Kabaev <ak03@gte.com> Cc: <openoffice@FreeBSD.ORG> Subject: Re: gcc3.1.1 release does make regmerge hang again (OO.org compile) Message-ID: <20020805191312.N58571-100000@levais.imp.ch> In-Reply-To: <20020805110611.4292e3d5.ak03@gte.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
This seems to help for now:
--- ../registry/tools/checksingleton.cxx.orig Mon Aug 5 19:04:53 2002
+++ ../registry/tools/checksingleton.cxx Mon Aug 5 19:06:09 2002
@@ -62,6 +62,10 @@
#include <set>
+#ifdef FREEBSD
+#include <unistd.h>
+#endif
+
#ifndef _REGISTRY_REGISTRY_HXX_
#include "registry/registry.hxx"
#endif
@@ -528,8 +532,11 @@
options.getProgramName().getStr(), options.getTypeReg().getStr());
exit(11);
}
-
+#ifdef FREEBSD
+ _exit(0);
+#else
exit(0);
+#endif
}
--- ../registry/tools/regcompare.cxx.orig Mon Aug 5 19:04:46 2002
+++ ../registry/tools/regcompare.cxx Mon Aug 5 19:06:46 2002
@@ -63,6 +63,10 @@
A
#include <set>
#include <vector>
+#ifdef FREEBSD
+#include <unistd.h>
+#endif
+
#ifndef _REGISTRY_REGISTRY_HXX_
#include "registry/registry.hxx"
#endif
@@ -2200,7 +2204,11 @@
if ( nError > 0 )
exit(11);
else
+#ifdef FREEBSD
+ _exit(0);
+#else
exit(0);
+#endif
}
Martin
Martin Blapp, <mb@imp.ch> <mbr@FreeBSD.org>
------------------------------------------------------------------
ImproWare AG, UNIXSP & ISP, Zurlindenstrasse 29, 4133 Pratteln, CH
Phone: +41 061 826 93 00: +41 61 826 93 01
PGP: <finger -l mbr@freebsd.org>
PGP Fingerprint: B434 53FC C87C FE7B 0A18 B84C 8686 EF22 D300 551E
------------------------------------------------------------------
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-openoffice" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020805191312.N58571-100000>