Re: BeOS Build error:


Subject: Re: BeOS Build error:
From: Sam TH (sam@uchicago.edu)
Date: Tue Dec 05 2000 - 16:58:04 CST


On Tue, Dec 05, 2000 at 12:56:40AM -0600, Sam TH wrote:
> On Mon, Dec 04, 2000 at 11:47:03AM -0500, Ben Hall wrote:
> > Okay,
> >
> > I've got a BeOS binary, md5sum, and a patch file ready to uplaod.
> >
> > They are all being uplaoded now to:
> >
> > http://www.moses.cx/files/Abi/BeOS/
> >
> > I have NO ideas id I did the patch right, to be honest it's my first one.
> > I'm not even sure if what I've commented out is the right stuff.
> > However, the BeOS build did compile.
> >
> > The diff file seems to have my directories hard-coded in, I'm sorry for
> > this, but I really don't know what I'm doing.
>
> The diff was fine, and has been committed.

Upon further inspection, this patch is wrong. For several reasons:

1) Since you #ifdef'ed *in* the offending sections, it's clear that
__BEOS__ wasn't defined on your system anyway.

2) The ifdefs covered code they shouldn't have.

3) The real patch is much much simpler. The following patch should
work, let me know if it does please.

Index: util/xp/ut_types.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_types.h,v
retrieving revision 1.38
diff -u -r1.38 ut_types.h
--- util/xp/ut_types.h 2000/11/14 21:48:30 1.38
+++ util/xp/ut_types.h 2000/12/05 22:57:30
@@ -174,7 +174,10 @@
 
 /* UGLY UGLY Iconv hack for win32. I will suffer in the afterlife for this */
 
-#if defined (WIN32) || defined(__QNXNTO__) || (defined (__MACH__) && defined (__APPLE__))
+#if defined (WIN32) || defined(__QNXNTO__) || \
+(defined (__MACH__) && defined (__APPLE__)) || \
+defined(__BEOS__) || defined (__AIX__)
+
 #define ICONV_CONST const
 #else
 #define ICONV_CONST

Hope that fixes this problem. Please, report

           
        sam th
        sam@uchicago.edu
        http://www.abisource.com/~sam/
        GnuPG Key:
        http://www.abisource.com/~sam/key




This archive was generated by hypermail 2b25 : Tue Dec 05 2000 - 16:58:08 CST