[Pkg-silc-commits] r140 - in /silc-toolkit/trunk: debian/changelog lib/silcutil/silcatomic.h

[lunar at users.alioth.debian.org]

Author: lunar
Date: Wed Jul 11 11:28:54 2007
New Revision: 140

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=140
Log:
* Fix some IA64 related functions in lib/silcutil/silcatomic.h, allowing
  silc-toolkit to build on ia64.

Modified:
    silc-toolkit/trunk/debian/changelog
    silc-toolkit/trunk/lib/silcutil/silcatomic.h

Modified: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=140&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Wed Jul 11 11:28:54 2007
@@ -1,3 +1,10 @@
+silc-toolkit (1.1.2-2) unstable; urgency=low
+
+  * Fix some IA64 related functions in lib/silcutil/silcatomic.h, allowing
+    silc-toolkit to build on ia64.
+
+ -- Jérémy Bobbio <lunar at debian.org>  Wed, 11 Jul 2007 13:27:58 +0200
+
 silc-toolkit (1.1.2-1) unstable; urgency=low
 
   * New upstream release including more security fixes.

Modified: silc-toolkit/trunk/lib/silcutil/silcatomic.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/silcatomic.h?rev=140&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/silcatomic.h (original)
+++ silc-toolkit/trunk/lib/silcutil/silcatomic.h Wed Jul 11 11:28:54 2007
@@ -753,7 +753,7 @@
 SILC_ATOMIC_ADD_INT_F(bits)						\
 {									\
   SilcUInt##bits ret;							\
-  SilcInt32 val = value;
+  SilcInt32 val = value;						\
   /* GCC + IA64 (GCC builtin atomic operations) */			\
   ret = __sync_fetch_and_add(&atomic->value, val);			\
   return ret + value;							\
@@ -1230,7 +1230,7 @@
 
 #elif defined(__GNUC__) && defined(SILC_IA64)
   /* GCC + IA64 (GCC builtin atomic operations) */
-  return  __sync_bool_compare_and_swap((long)&atomic->value, (long)old_val,
+  return  __sync_bool_compare_and_swap((long *)&atomic->value, (long)old_val,
 				       (long)new_val);
 
 #elif defined(__GNUC__) && defined(SILC_POWERPC)