[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    [PATCH] Re:  kexi still Linux-only
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2003-10-22 7:53:26
[Download RAW message or body]

[Weird quoting caused by KMail 1.5.4]

On Wednesday 22 October 2003 04:45, Kaarthik Sivakumar wrote:
> >>> "AdG" == Adriaan de Groot <adridg@cs.kun.nl> writes:
>
> AdG> Kexi's build has been failing on FreeBSD for some time now. I can't
> really AdG> tell what it's doing, but
>
> AdG> In file included from
> AdG> /mnt/src/kde-HEAD//koffice/kexi/3rdparty/uuid/gen_uuid.c:47:
> AdG> /mnt/src/kde-HEAD/koffice/kexi/3rdparty/uuid/uuidP.h:37: syntax error
> before AdG> `__u32'
>
> The '__u32' just seems to be a typedef to 'unsigned int'. According to
> the KDE lxr at http://lxr.kde.org/ident?i=__u32, '__u32' is defined in
> a few places and gen_uuid.c should just include the right file. 

This is gonna be loads of fun then. I just got my amd64 box, and I don't know 
what int size FBSD defaults to on that. I got it partly because of 64-bit 
issues.

> I dont
> know what the right file is. How does this compile on Linux, without
> this definition? Unless '__u32' is already defined in the Linux system
> includes.

I'm fairly sure it _is_ defined in Linux system headers .. in asm/types.h, in 
fact. It's not defined anywhere in FBSD's system headers. Like I said before, 
I think the right solution is to use the Q_ fixed-bit-size types. Except now 
I realize that's bunk, since this uuid crud is C and not C++. Find attached a 
patch that lacks elegance, but does map the FBSD defined fixed-bit-size types 
onto the linux names.

["uuid.diff" (text/x-diff)]

--- uuid.orig/uuidP.h	Wed Oct 22 09:37:57 2003
+++ uuid/uuidP.h	Wed Oct 22 09:51:00 2003
@@ -25,6 +25,12 @@
 #endif
 #endif
 
+#ifdef __FreeBSD__
+typedef u_int32_t __u32;
+typedef u_int16_t __u16;
+typedef u_int8_t __u8;
+#endif
+
 #include "uuid.h"
 
 /*


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]