Gentoo Archives: gentoo-commits

From: "Roy Marples (uberlord)" <uberlord@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server/files: evolution-data-server-1.12.1-icaltz-util.patch
Date: Fri, 19 Oct 2007 11:07:48
Message-Id: E1IipXU-0006gE-14@stork.gentoo.org
1 uberlord 07/10/19 10:57:12
2
3 Added: evolution-data-server-1.12.1-icaltz-util.patch
4 Log:
5 bswap_32 is linux only, BSD's use bswap32
6 (Portage version: 2.1.3.15)
7
8 Revision Changes Path
9 1.1 gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch?rev=1.1&content-type=text/plain
13
14 Index: evolution-data-server-1.12.1-icaltz-util.patch
15 ===================================================================
16 diff -ur a/calendar/libical/src/libical/icaltz-util.c b/calendar/libical/src/libical/icaltz-util.c
17 --- a/calendar/libical/src/libical/icaltz-util.c 2007-10-12 07:31:10 +0100
18 +++ b/calendar/libical/src/libical/icaltz-util.c 2007-10-19 11:34:38 +0100
19 @@ -23,9 +23,11 @@
20 #include <string.h>
21 #if defined(sun) && defined(__SVR4)
22 #include <sys/byteorder.h>
23 -#else
24 +#elif defined(__linux__)
25 #include <byteswap.h>
26 #include <endian.h>
27 +#else
28 +#include <sys/endian.h>
29 #endif
30 #include <limits.h>
31 #include <time.h>
32 @@ -89,7 +91,11 @@
33 if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
34 return *(const int *) ptr;
35 else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
36 +#ifdef __linux__
37 return bswap_32 (*(const int *) ptr);
38 +#else
39 + return bswap32 (*(const uint32_t *) ptr);
40 +#endif
41 #endif
42 else
43 {
44
45
46
47 --
48 gentoo-commits@g.o mailing list