From 8ac92e860769b822300115064d090cff0645c7dd Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Jul 2005 14:49:13 +0000
Subject: [PATCH] Two tiny cleanup patches from James H.

[originally from svn r6111]
---
 misc.c     | 2 +-
 untangle.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc.c b/misc.c
index 5ad4d0b..91778d8 100644
--- a/misc.c
+++ b/misc.c
@@ -194,7 +194,7 @@ void game_mkhighlight(frontend *fe, float *ret,
     }
 }
 
-void memswap(void *av, void *bv, int size)
+static void memswap(void *av, void *bv, int size)
 {
     char tmpbuf[512];
     char *a = av, *b = bv;
diff --git a/untangle.c b/untangle.c
index 9fc786b..5d01e9a 100644
--- a/untangle.c
+++ b/untangle.c
@@ -284,7 +284,7 @@ static unsigned long squarert(unsigned long n) {
 
     d = n;
     a = 0;
-    b = 1 << 30;		       /* largest available power of 4 */
+    b = 1L << 30;		       /* largest available power of 4 */
     do {
         a >>= 1;
         di = 2*a + b;