r3968 - branches/2.0/varnish-cache/lib/libvarnish

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-20 12:17:17 +0100 (Fri, 20 Mar 2009)
New Revision: 3968

Modified:
   branches/2.0/varnish-cache/lib/libvarnish/vsha256.c
Log:
Merge r3827: Replace __inline with inline

C99 standardised "inline" and the Sun compiler doesn't like __inline,
so change to using inline consistently.



Modified: branches/2.0/varnish-cache/lib/libvarnish/vsha256.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/vsha256.c	2009-03-20 11:08:41 UTC (rev 3967)
+++ branches/2.0/varnish-cache/lib/libvarnish/vsha256.c	2009-03-20 11:17:17 UTC (rev 3968)
@@ -45,7 +45,7 @@
 #include "libvarnish.h"
 #include "vsha256.h"
 
-static __inline void
+static inline void
 mybe32enc(void *pp, uint32_t u)
 {
         unsigned char *p = (unsigned char *)pp;
@@ -56,7 +56,7 @@
         p[3] = u & 0xff;
 }
 
-static __inline void
+static inline void
 mybe64enc(void *pp, uint64_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
@@ -77,7 +77,7 @@
 
 #else /* BYTE_ORDER != BIG_ENDIAN or in doubt... */
 
-static __inline uint32_t
+static inline uint32_t
 mybe32dec(const void *pp)
 {
         unsigned char const *p = (unsigned char const *)pp;