libical r661 - in branches/gnome-2-24: . src/libical

[tml svn gnome org]

Author: tml
Date: Mon Jan 12 16:09:43 2009
New Revision: 661
URL: http://svn.gnome.org/viewvc/libical?rev=661&view=rev

Log:
2009-01-12  Tor Lillqvist  <tml novell com>

	Merge from trunk:

	* src/libical/icaltz-util.c: Call the byte-swapping macro bswap32
	on Windows, as that is what the code that uses it wants on
	non-Linux.



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/libical/icaltz-util.c

Modified: branches/gnome-2-24/src/libical/icaltz-util.c
==============================================================================
--- branches/gnome-2-24/src/libical/icaltz-util.c	(original)
+++ branches/gnome-2-24/src/libical/icaltz-util.c	Mon Jan 12 16:09:43 2009
@@ -27,7 +27,7 @@
 #define BIG_ENDIAN 'B'
 #define LITTLE_ENDIAN 'l'
 #define BYTE_ORDER LITTLE_ENDIAN
-#define bswap_32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) <<  8) | (((val) & 0x00ff0000U) >>  8) | (((val) & 0xff000000U) >> 24))
+#define bswap32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) <<  8) | (((val) & 0x00ff0000U) >>  8) | (((val) & 0xff000000U) >> 24))
 #elif defined(__linux__)
 #include <byteswap.h>
 #include <endian.h>