X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fyaffs_qsort.c;h=608ec8b17b586553ee82485ffca29aa72ca2968a;hb=b295567b94e6d4014938e42e978306a13b330bb3;hp=187519fbdb55c824184d4be0a30fd53444562def;hpb=470ba34cc1d593fca7cd98bb9a385a100f7cb3ac;p=yaffs2.git

diff --git a/direct/yaffs_qsort.c b/direct/yaffs_qsort.c
index 187519f..608ec8b 100644
--- a/direct/yaffs_qsort.c
+++ b/direct/yaffs_qsort.c
@@ -33,11 +33,11 @@
 /*
  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
  */
-#define swapcode(TYPE, parmi, parmj, n) do { 		\
-	long i = (n) / sizeof (TYPE); 			\
-	register TYPE *pi = (TYPE *) (parmi); 		\
-	register TYPE *pj = (TYPE *) (parmj); 		\
-	do { 						\
+#define swapcode(TYPE, parmi, parmj, n) do {		\
+	long i = (n) / sizeof(TYPE);			\
+	register TYPE *pi = (TYPE *) (parmi);		\
+	register TYPE *pj = (TYPE *) (parmj);		\
+	do {						\
 		register TYPE	t = *pi;		\
 		*pi++ = *pj;				\
 		*pj++ = t;				\
@@ -47,7 +47,7 @@
 #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
 	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
 
-static __inline void
+static inline void
 swapfunc(char *a, char *b, int n, int swaptype)
 {
 	if (swaptype <= 1)
@@ -65,9 +65,9 @@ swapfunc(char *a, char *b, int n, int swaptype)
 		swapfunc(a, b, es, swaptype);		\
 } while (0)
 
-#define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
+#define vecswap(a, b, n)	if ((n) > 0) swapfunc(a, b, n, swaptype)
 
-static __inline char *
+static inline char *
 med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
 {
 	return cmp(a, b) < 0 ?
@@ -150,10 +150,10 @@ loop:	SWAPINIT(a, es);
 	r = min((long)(pd - pc), (long)(pn - pd - es));
 	vecswap(pb, pn - r, r);
 	r = pb - pa;
-	if (r > es)
+	if (r > (int)es)
 		yaffs_qsort(a, r / es, es, cmp);
 	r = pd - pc;
-	if (r > es) {
+	if (r > (int)es) {
 		/* Iterate rather than recurse to save stack space */
 		a = pn - r;
 		n = r / es;